From 55405a7c716d3856d5a8ac17b30ad85d074b5050 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 15:24:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=20wx=5Fpay=5Forder=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 2 +- .../service/impl/WxProfitSharingOrderServiceImpl.java | 2 +- .../service/pay/service/refund/wx/WxRefundAdapterService.java | 4 ++-- .../service/pay/service/share/wx/WxPayShareService.java | 2 +- .../com/iformall/controller/micropay/MicropayController.java | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 74ab24c0e..6dd7a0533 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -527,7 +527,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (StringUtils.isBlank(record.getPayOrderNo())) { record.setPayOrderNo(String.valueOf(record.getId())); } - WxPayOrder payOrder = wxPayOrderMapper.selectById(record.getId()); + WxPayOrder payOrder = wxPayOrderMapper.selectById(record.getId(),record.getTenantId()); if (payOrder != null) { record.setPayOrderStatus(payOrder.getPayOrderStatus()); record.setShare(payOrder.getShare()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 0e2f3fb6e..1cd06b082 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -123,7 +123,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ Integer payWay; if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()) ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){ - WxPayOrder wxPayOrder = wxPayOrderMapper.selectById(wxProfitSharingOrder.getOrderId()); + WxPayOrder wxPayOrder = wxPayOrderMapper.selectById(wxProfitSharingOrder.getOrderId(),wxProfitSharingOrder.getTenantId()); if (wxPayOrder == null) throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"wxProfitSharingOrder["+wxProfitSharingOrder.getId()+"] 没有payOrder信息."); appinfo = getAppinfo(wxPayOrder.getTenantId(),wxPayOrder.getPayVendor()); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java index f85bca4d3..2af713b9a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/wx/WxRefundAdapterService.java @@ -516,7 +516,7 @@ public class WxRefundAdapterService implements RefundPayAdapterService{ String payOrderNo = reqMap.get("out_trade_no"); Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId()); if (payOrder == null) { log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); return notifyErrorResult("支付订单不存在"); @@ -590,7 +590,7 @@ public class WxRefundAdapterService implements RefundPayAdapterService{ return notifySuccessResult(reqMap.get("transaction_id"), reqMap.get("refund_id"), null); } Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId()); if (payOrder == null) { log.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); return notifyErrorResult("支付订单不存在"); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java index 488aae2a7..f7423dcf9 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java @@ -285,7 +285,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{ String payOrderNo = paramMap.get("out_trade_no"); String timEndStr = paramMap.get("time_end"); Long payOrderId = Long.valueOf(payOrderNo); - WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId); + WxPayOrder payOrder = wxPayOrderMapper.selectById(payOrderId,payAccount.getTenantId()); if (payOrder == null) { log.warn("notify order, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); return getErrorResult("订单不存在"); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java index 0934e045a..03b0ff9b6 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/micropay/MicropayController.java @@ -62,6 +62,7 @@ public class MicropayController extends BaseController { WxPayOrder q = new WxPayOrder(); q.setTenantId(tenantId); q.setOrderId(order.getId()); + q.updateTenantInfo(bUser); List payOrderList = payOrderMapper.selectList(new QueryWrapper<>(q)); if (payOrderList.size() > 0) { // 查询支付订单状态