diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 62d153624..136c90e4e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -492,7 +492,7 @@ public class WxMicroPayController extends BaseController { // record.setIp(ipStr); WxPayOrder qpo = new WxPayOrder(); - qpo.setOrderId(microOrder.getId()); + qpo.setOrderId(microOrder.getComposeOrderId()); qpo.updateTenantInfo(getTenantInfo()); WxPayOrder po = wxPayOrderService.getByObj(qpo); if (null == po) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 6c629f419..b7c85c655 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -202,11 +202,11 @@ public class CouponOrderExpiringSchedule { try { WxPayOrder wxPayOrder = new WxPayOrder(); wxPayOrder.updateTenantInfo(co); - Long orderId = co.getOrderId(); - if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { - orderId = co.getComposeOrderId(); - } - wxPayOrder.setOrderId(orderId); +// Long orderId = co.getOrderId(); +// if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { +// orderId = co.getComposeOrderId(); +// } + wxPayOrder.setOrderId(co.getComposeOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 69d24ab9f..00de687ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -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); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index 1846aea47..d4a3eb984 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -460,7 +460,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { WxPayOrder payOrderQ = new WxPayOrder(); payOrderQ.updateTenantInfo(wxOrder); payOrderQ.setCUserId(wxOrder.getCUserId()); - payOrderQ.setOrderId(wxOrder.getId()); + payOrderQ.setOrderId(wxOrder.getComposeOrderId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); WxPayOrder payOrder = null;