|
|
|
@@ -1548,12 +1548,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
//TODO (系统设置不分账抖音也需要分账)抖音先记账, 定时去处理分账业务 |
|
|
|
WxPayOrder wxPayOrder = new WxPayOrder(); |
|
|
|
Long orderId = couponOrder.getOrderId(); |
|
|
|
if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { |
|
|
|
orderId = couponOrder.getComposeOrderId(); |
|
|
|
} |
|
|
|
// Long orderId = couponOrder.getOrderId(); |
|
|
|
// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { |
|
|
|
// orderId = couponOrder.getComposeOrderId(); |
|
|
|
// } |
|
|
|
wxPayOrder.updateTenantInfo(couponOrder); |
|
|
|
wxPayOrder.setOrderId(orderId); |
|
|
|
wxPayOrder.setOrderId(couponOrder.getComposeOrderId()); |
|
|
|
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); |
|
|
|
|
|
|
|
@@ -1668,14 +1668,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
// 微信分账 |
|
|
|
try { |
|
|
|
WxPayOrder wxPayOrder = new WxPayOrder(); |
|
|
|
Long orderId = couponOrder.getOrderId(); |
|
|
|
|
|
|
|
if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { |
|
|
|
orderId = couponOrder.getComposeOrderId(); |
|
|
|
} |
|
|
|
// Long orderId = couponOrder.getOrderId(); |
|
|
|
// |
|
|
|
// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { |
|
|
|
// orderId = couponOrder.getComposeOrderId(); |
|
|
|
// } |
|
|
|
|
|
|
|
wxPayOrder.updateTenantInfo(couponOrder); |
|
|
|
wxPayOrder.setOrderId(orderId); |
|
|
|
wxPayOrder.setOrderId(couponOrder.getComposeOrderId()); |
|
|
|
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); |
|
|
|
if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { |
|
|
|
@@ -2640,7 +2640,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
payOrder.setId(payOrderId); |
|
|
|
payOrder.updateTenantInfo(composeOrder.getSingleOrder()); |
|
|
|
payOrder.setCUserId(composeOrder.getSingleOrder().getCUserId()); |
|
|
|
payOrder.setOrderId(composeOrder.getSingleOrder().getId()); |
|
|
|
payOrder.setOrderId(composeOrder.getSingleOrder().getComposeOrderId()); |
|
|
|
payOrder.setCreateTime(curDate); |
|
|
|
payOrder.setUpdateTime(curDate); |
|
|
|
payOrder.setPayTimeStart(curDate); |
|
|
|
|