Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java

@@ -9,13 +9,11 @@ import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.entity.HighCoupon;
+import com.hai.entity.*;
-import com.hai.entity.HighCouponHandsel;
-import com.hai.entity.HighGoodsPriceRefer;
-import com.hai.entity.HighMerchant;
 import com.hai.model.HighCouponModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
+import com.hai.service.HighApproveService;
 import com.hai.service.HighCouponService;
 import com.hai.service.HighGoodsPriceReferService;
 import io.swagger.annotations.Api;
@@ -51,6 +49,9 @@ public class HighGoodsPriceReferController {
     @Resource
     private HighGoodsPriceReferService highGoodsPriceReferService;
 
+    @Resource
+    private HighApproveService highApproveService;
+
     @Resource
     private HighCouponService highCouponService;
 
@@ -106,7 +107,8 @@ public class HighGoodsPriceReferController {
             highGoodsPriceRefer.setStatus(101);   // 状态: 0:删除 1:待编辑  2:待生效  3:已生效  4:已失效  101.审批中  102.审批驳回
             highGoodsPriceRefer.setOperatorId(userInfoModel.getSecUser().getId());
             highGoodsPriceRefer.setOperatorName(userInfoModel.getSecUser().getUserName());
-            highGoodsPriceReferService.insertPriceRefer(highGoodsPriceRefer);
+            // highApproveService.insertApprove();
+            highGoodsPriceReferService.submitApprove(highGoodsPriceRefer);
 
             return ResponseMsgUtil.success("操作成功");
 

hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java

@@ -56,7 +56,7 @@ public class ImportCouponListener extends AnalysisEventListener<ImportCouponMode
         }
 
         highCouponCode = new HighCouponCode();
-        highCouponCode.setCouponId(highCoupon.getCompanyId());
+        highCouponCode.setCouponId(highCoupon.getId());
         highCouponCode.setMerchantId(highCoupon.getMerchantId());
         highCouponCode.setSalesCode(importCouponModel.getSalesCode());
 

hai-service/src/main/java/com/hai/service/HighGoodsPriceReferService.java

@@ -30,6 +30,13 @@ public interface HighGoodsPriceReferService {
      **/
     void updatePriceRefer(HighGoodsPriceRefer highGoodsPriceRefer);
 
+    /**
+     * @Author 胡锐
+     * @Description 提交审批
+     * @Date 2021/3/24 16:16
+     **/
+    void submitApprove(HighGoodsPriceRefer highGoodsPriceRefer);
+
     /**
      * @Author 胡锐
      * @Description 根据id查询

hai-service/src/main/java/com/hai/service/impl/HighGoodsPriceReferServiceImpl.java

@@ -34,6 +34,12 @@ public class HighGoodsPriceReferServiceImpl implements HighGoodsPriceReferServic
         highGoodsPriceReferMapper.updateByPrimaryKey(highGoodsPriceRefer);
     }
 
+    @Override
+    public void submitApprove(HighGoodsPriceRefer highGoodsPriceRefer) {
+        insertPriceRefer(highGoodsPriceRefer);
+
+    }
+
     @Override
     public HighGoodsPriceRefer getPriceReferById(Long id) {
         return highGoodsPriceReferMapper.selectByPrimaryKey(id);