Browse Source

update gift

release_toaliyun_real
xhxu 4 years ago
parent
commit
51058fd034
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

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

@@ -1290,7 +1290,11 @@ public class WxOrderServiceImpl implements WxOrderService {
throw new MallinkException(ErrorCode.COUPON_IS_NOT_FREE.getCode(), coupon.getTitle() + ErrorCode.COUPON_IS_NOT_FREE.getMessage());
}

if(!EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){
Integer composeOrderType = EnumComposeOrder.SINGLE.getCode();
if(EnumPayWay.PAY_WAY_NOT_UNPAY_GIFTLIST.equals(payWay)){
composeOrderType = EnumComposeOrder.PACKAGECOUPON_SUB.getCode();
}else{
composeOrderType = EnumComposeOrder.SINGLE.getCode();
if (Objects.nonNull(wxCouponSendVo) && Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSendVo.getSendType())) {
// 商户注券减库存操作
try {
@@ -1333,7 +1337,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setCreateDate(curr);
record.setUpdateDate(curr);
record.setComposeOrderId(0L);
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
record.setComposeOrderType(composeOrderType);
record.setCouponNumber(1);
// 保存订单
try {


Loading…
Cancel
Save