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