|
|
|
@@ -2021,7 +2021,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
} |
|
|
|
//如果没有orderId,则用lastOrder的信息 |
|
|
|
if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId().intValue() <= 0) { |
|
|
|
if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId() <= 0) { |
|
|
|
return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment()); |
|
|
|
} |
|
|
|
return composeOrder; |
|
|
|
@@ -2106,11 +2106,11 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
if (null != composeOrder) { |
|
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
|
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
}else { |
|
|
|
//if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
// record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
//}else { |
|
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
} |
|
|
|
//} |
|
|
|
}else { |
|
|
|
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
record.setComposeOrderId(0L); |
|
|
|
@@ -2174,11 +2174,11 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
|
|
|
|
record.setOrderStatus(orderStatus); |
|
|
|
record.setComposeOrderId(composeOrder.getMainOrderId()); |
|
|
|
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
}else { |
|
|
|
//if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { |
|
|
|
// record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
//}else { |
|
|
|
record.setComposeOrderType(composeOrder.getComposeOrderType()); |
|
|
|
} |
|
|
|
//} |
|
|
|
|
|
|
|
record.setCouponNumber(couponNumber); |
|
|
|
try { |
|
|
|
|