From 884d8e41d35d5e37245c8d6c57de233df101d2a0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 12 Oct 2021 20:10:45 +0800 Subject: [PATCH] update gift --- .../src/main/java/com/iformall/enums/EnumComposeOrder.java | 1 - mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java | 2 +- .../main/java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java index 0e35883cf..929d65cf4 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java @@ -11,7 +11,6 @@ public enum EnumComposeOrder { ONE_NUMBER_ORDER_BATCH(1, "购物车式组合下单,1个数量1个订单(针对同样产品)"), MULITY_NUMBER_ORDER_BATCH(2,"购物车式组合下单,多个数量1个订单(针对同样产品)"), PACKAGECOUPON(3,"券包订单类型"), - PACKAGECOUPON_SUB(4,"券包子订单类型") ; public static EnumComposeOrder getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java b/mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java index f302edc7b..a99899c91 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java @@ -22,7 +22,7 @@ public enum EnumPayWay { PAY_WAY_NOT_UNPAY_TRADE(97, "交易发券,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_PASSWD(98, "根据卡密兑换卡,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_CREDIT(99, "积分兑换券,无需支付",null,null,null), - PAY_WAY_NOT_UNPAY_GIFTLIST(100, "卷包兑换券,无需支付",null,null,null) + PAY_WAY_NOT_UNPAY_GIFTLIST(100, "卷包子券,无需支付",null,null,null) ; public static EnumPayWay getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 2404afeef..410ba58b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1300,7 +1300,7 @@ public class WxOrderServiceImpl implements WxOrderService { Integer composeOrderType = EnumComposeOrder.SINGLE.getCode(); if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){ - composeOrderType = EnumComposeOrder.PACKAGECOUPON_SUB.getCode(); + composeOrderType = EnumComposeOrder.PACKAGECOUPON.getCode(); }else{ composeOrderType = EnumComposeOrder.SINGLE.getCode(); if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) {