| @@ -494,6 +494,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| record.setPayVendor(payWay.getCode()); | record.setPayVendor(payWay.getCode()); | ||||
| record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | ||||
| record.setShare(isShare.getCode()); | record.setShare(isShare.getCode()); | ||||
| record.setComposeOrder(EnumComposeOrder.SINGLE.getCode()); | |||||
| if (isShare == EnumPayShare.YES) { | if (isShare == EnumPayShare.YES) { | ||||
| // 分账金额 | // 分账金额 | ||||
| int iChargeFee = OrderHelper.getMallCharge(record.getPayAmount(), payAccount); | int iChargeFee = OrderHelper.getMallCharge(record.getPayAmount(), payAccount); | ||||
| @@ -942,6 +943,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| } | } | ||||
| WxPayOrderServiceImpl proxy = (WxPayOrderServiceImpl) AopContext.currentProxy(); | WxPayOrderServiceImpl proxy = (WxPayOrderServiceImpl) AopContext.currentProxy(); | ||||
| if (null == record.getComposeOrder()) { | |||||
| record.setComposeOrder(EnumComposeOrder.SINGLE.getCode()); | |||||
| } | |||||
| OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(record.getComposeOrder()); | OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(record.getComposeOrder()); | ||||
| WxComposeOrder composeOrder = orderAdapterService.getComposeOrder(record.getOrderId(), record.getTenantId()); | WxComposeOrder composeOrder = orderAdapterService.getComposeOrder(record.getOrderId(), record.getTenantId()); | ||||
| List<WxOrder> orderList = orderAdapterService.getChildOrders(composeOrder, record.getTenantId()); | List<WxOrder> orderList = orderAdapterService.getChildOrders(composeOrder, record.getTenantId()); | ||||