From 92d81f4fe2b04bc867510d5abe0416968f4fdd7b Mon Sep 17 00:00:00 2001 From: 199901012 Date: Wed, 24 Mar 2021 16:28:37 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HighGoodsPriceReferController.java | 2 +- .../service/impl/HighCouponServiceImpl.java | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java index 2d7c5c0b..1110e41d 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java +++ b/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("操作成功"); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java index 2c27214a..e829f393 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java +++ b/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) { - couponDetail.setStatus(2); + if (highApprove.getStatus() == 2) { + couponDetail.setStatus(102); + } + if (highApprove.getStatus() == 3) { + couponDetail.setStatus(2); Map map = new HashMap<>(); map.put("objectType", 1); map.put("objectId", couponDetail.getId()); map.put("status", 1); List list = highGoodsPriceReferService.getPriceList(map); if (list != null && list.size() > 0) { - for (HighGoodsPriceRefer priceRefer : list) { - priceRefer.setEffectiveTime(new Date()); - priceRefer.setStatus(3); - highGoodsPriceReferService.updatePriceRefer(priceRefer); - } + for (HighGoodsPriceRefer priceRefer : list) { + priceRefer.setEffectiveTime(new Date()); + priceRefer.setStatus(3); + highGoodsPriceReferService.updatePriceRefer(priceRefer); + } } } - if (highApprove.getStatus() == 2) { - couponDetail.setStatus(102); - } - highCouponMapper.updateByPrimaryKey(couponDetail); }