From 5f72dcffbb3d36f502b384b83d3d48b2ee064940 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Sep 2021 23:36:07 +0800 Subject: [PATCH] fix order --- .../java/com/iformall/controller/WxMicroPayController.java | 2 +- .../com/iformall/schedule/CouponOrderExpiringSchedule.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index f4dcfbf64..4f5285202 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -103,7 +103,7 @@ public class WxMicroPayController extends BaseController { WxPayOrder record = new WxPayOrder(); record.updateTenantInfo(user); - record.setOrderId(order.getId()); + record.setOrderId(EnumComposeOrder.getPayOrderId(order)); record.setAuthCode(authCode); record.setPayAmount(order.getPayment()); record.setIp(ipStr); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 935271bcc..7e5b0b755 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -162,7 +162,11 @@ public class CouponOrderExpiringSchedule { try { WxPayOrder wxPayOrder = new WxPayOrder(); wxPayOrder.updateTenantInfo(co); - wxPayOrder.setOrderId(co.getOrderId()); + Long orderId = co.getOrderId(); + if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { + orderId = co.getComposeOrderId(); + } + wxPayOrder.setOrderId(orderId); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) {