|
|
|
@@ -2539,8 +2539,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
} |
|
|
|
//如果没有orderId,则用lastOrder的信息 |
|
|
|
if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId() <= 0) { |
|
|
|
return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment()); |
|
|
|
if (EnumComposeOrder.isSingle(composeOrderType.getCode())) { |
|
|
|
composeOrder.setSingleOrder(lastOrder); |
|
|
|
} |
|
|
|
return composeOrder; |
|
|
|
} |
|
|
|
|