Browse Source

update gift

release_toaliyun_real
xhxu 4 years ago
parent
commit
884d8e41d3
3 changed files with 2 additions and 3 deletions
  1. +0
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 0
- 1
mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java View File

@@ -11,7 +11,6 @@ public enum EnumComposeOrder {
ONE_NUMBER_ORDER_BATCH(1, "购物车式组合下单,1个数量1个订单(针对同样产品)"), ONE_NUMBER_ORDER_BATCH(1, "购物车式组合下单,1个数量1个订单(针对同样产品)"),
MULITY_NUMBER_ORDER_BATCH(2,"购物车式组合下单,多个数量1个订单(针对同样产品)"), MULITY_NUMBER_ORDER_BATCH(2,"购物车式组合下单,多个数量1个订单(针对同样产品)"),
PACKAGECOUPON(3,"券包订单类型"), PACKAGECOUPON(3,"券包订单类型"),
PACKAGECOUPON_SUB(4,"券包子订单类型")
; ;


public static EnumComposeOrder getEnum(Integer code) { public static EnumComposeOrder getEnum(Integer code) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumPayWay.java View File

@@ -22,7 +22,7 @@ public enum EnumPayWay {
PAY_WAY_NOT_UNPAY_TRADE(97, "交易发券,无需支付",null,null,null), PAY_WAY_NOT_UNPAY_TRADE(97, "交易发券,无需支付",null,null,null),
PAY_WAY_NOT_UNPAY_PASSWD(98, "根据卡密兑换卡,无需支付",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_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) { public static EnumPayWay getEnum(Integer code) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -1300,7 +1300,7 @@ public class WxOrderServiceImpl implements WxOrderService {


Integer composeOrderType = EnumComposeOrder.SINGLE.getCode(); Integer composeOrderType = EnumComposeOrder.SINGLE.getCode();
if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){ if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){
composeOrderType = EnumComposeOrder.PACKAGECOUPON_SUB.getCode();
composeOrderType = EnumComposeOrder.PACKAGECOUPON.getCode();
}else{ }else{
composeOrderType = EnumComposeOrder.SINGLE.getCode(); composeOrderType = EnumComposeOrder.SINGLE.getCode();
if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) { if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) {


Loading…
Cancel
Save