From ad854450e1bbd0a368bfe91e211047cdcd39a1eb Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 5 Jul 2019 13:54:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201907051354__L_ADD_FLOW_DATA.sql | 1 + .../main/java/com/iformall/service/impl/WxFlowServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201907051354__L_ADD_FLOW_DATA.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907051354__L_ADD_FLOW_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201907051354__L_ADD_FLOW_DATA.sql new file mode 100644 index 000000000..908fb5bbc --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907051354__L_ADD_FLOW_DATA.sql @@ -0,0 +1 @@ +update wx_flow_config set name = '有价券审批' where name ='有价卷审批'; 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 c4adb0d1d..fae2b2921 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -204,8 +204,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxCoupon.setPutApplyStatus(applyStatus); }else if(EnumCouponAppType.STOCK.getCode().equals(operateType)){ wxCoupon.setStockApplyStatus(applyStatus); - if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue() - ||EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)) { + if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { //减库存 if(EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)) { Integer inventory = (Integer) getVariableByKey(variables, "inventory");