From 0d673888c89e9887c46a0624fab851ada964c920 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 2 Jul 2019 11:26:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][bug100?= =?UTF-8?q?1949=201001948]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponController.java | 10 +++++++--- .../com/iformall/service/impl/WxFlowServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index ddf5ecefd..55938934d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -205,9 +205,13 @@ public class WxCouponController extends BaseController { variables.add(map); wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); - wxCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); - wxCoupon.setUpdateDate(new Date()); - wxCouponService.update(wxCoupon); + //更新状态 + WxCoupon updateCoupon = new WxCoupon(); + updateCoupon.setTenantId(wxCoupon.getTenantId()); + updateCoupon.setId(wxCoupon.getId()); + updateCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + updateCoupon.setUpdateDate(new Date()); + wxCouponService.update(updateCoupon); }else{ return wxCouponService.updateCouponStockAndEndTime(wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index fc448f44d..c4adb0d1d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -207,7 +207,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue() ||EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)) { //减库存 - if(EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType)) { + if(EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)) { Integer inventory = (Integer) getVariableByKey(variables, "inventory"); Integer remainInventory = (Integer) getVariableByKey(variables, "remainInventory"); Integer type = (Integer) getVariableByKey(variables, "type");