|
|
|
@@ -523,6 +523,11 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
valid_date = calendar.getTime(); |
|
|
|
} |
|
|
|
} |
|
|
|
boolean isCard = false; |
|
|
|
// 检查是否是储值卡 |
|
|
|
if(coupon.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { |
|
|
|
isCard = true; |
|
|
|
} |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
|
|
|
|
WxCouponOrder couponOrder = new WxCouponOrder(); |
|
|
|
@@ -534,7 +539,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
couponOrder.setOwnerId(user.getId()); |
|
|
|
couponOrder.setOrderId(order.getOrderNumber()); |
|
|
|
couponOrder.setExpiredTime(valid_date); |
|
|
|
if(!coupon.getType().equals(EnumCouponType.CARD_MULTIMCH)) { |
|
|
|
if(!isCard) { |
|
|
|
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); |
|
|
|
} else { |
|
|
|
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_USING.getCode()); |
|
|
|
@@ -546,7 +551,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
wxCouponOrderMapper.insertSelective(couponOrder); |
|
|
|
|
|
|
|
/// 储值卡信息添加 |
|
|
|
if(coupon.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { |
|
|
|
if(isCard) { |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
try { |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
|