|
|
@@ -2080,7 +2080,11 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
record.setFormId(formId); |
|
|
record.setFormId(formId); |
|
|
record.setOrderGroupId(0L); |
|
|
record.setOrderGroupId(0L); |
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
|
|
|
|
|
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
|
|
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
|
|
}else { |
|
|
|
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
|
|
} |
|
|
record.setCouponNumber(couponNumber); |
|
|
record.setCouponNumber(couponNumber); |
|
|
try { |
|
|
try { |
|
|
proxy.saveFreeOrder(record, user, coupon); |
|
|
proxy.saveFreeOrder(record, user, coupon); |
|
|
@@ -2132,7 +2136,12 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
record.setPayment(price.getRealPayMent()); |
|
|
record.setPayment(price.getRealPayMent()); |
|
|
record.setOrderStatus(orderStatus); |
|
|
record.setOrderStatus(orderStatus); |
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
|
|
|
|
|
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
|
|
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
|
|
}else { |
|
|
|
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
record.setCouponNumber(couponNumber); |
|
|
record.setCouponNumber(couponNumber); |
|
|
try { |
|
|
try { |
|
|
orderNumber = proxy.saveNoFreeOrder(record, user, coupon, isPress); |
|
|
orderNumber = proxy.saveNoFreeOrder(record, user, coupon, isPress); |
|
|
|