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

@@ -107,7 +107,7 @@ public class HighGoodsPriceReferController {
             highGoodsPriceRefer.setStatus(101);   // 状态: 0:删除 1:待编辑  2:待生效  3:已生效  4:已失效  101.审批中  102.审批驳回
             highGoodsPriceRefer.setOperatorId(userInfoModel.getSecUser().getId());
             highGoodsPriceRefer.setOperatorName(userInfoModel.getSecUser().getUserName());
-            // highApproveService.insertApprove();
+
             highGoodsPriceReferService.submitApprove(highGoodsPriceRefer);
 
             return ResponseMsgUtil.success("操作成功");

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

@@ -189,27 +189,26 @@ public class HighCouponServiceImpl implements HighCouponService {
         }
 
         // 状态:  1:待审批  2:驳回  3:通过
-        if (highApprove.getStatus() == 1) {
+        if (highApprove.getStatus() == 2) {
-            couponDetail.setStatus(2);
+            couponDetail.setStatus(102);
+        }
 
+        if (highApprove.getStatus() == 3) {
+            couponDetail.setStatus(2);
             Map<String, Object> map = new HashMap<>();
             map.put("objectType", 1);
             map.put("objectId", couponDetail.getId());
             map.put("status", 1);
             List<HighGoodsPriceRefer> list = highGoodsPriceReferService.getPriceList(map);
             if (list != null && list.size() > 0) {
-              for (HighGoodsPriceRefer priceRefer : list) {
+                for (HighGoodsPriceRefer priceRefer : list) {
-                  priceRefer.setEffectiveTime(new Date());
+                    priceRefer.setEffectiveTime(new Date());
-                  priceRefer.setStatus(3);
+                    priceRefer.setStatus(3);
-                  highGoodsPriceReferService.updatePriceRefer(priceRefer);
+                    highGoodsPriceReferService.updatePriceRefer(priceRefer);
-              }
+                }
             }
         }
 
-        if (highApprove.getStatus() == 2) {
-            couponDetail.setStatus(102);
-        }
-
         highCouponMapper.updateByPrimaryKey(couponDetail);
     }