diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java index 275248433..6c742b21c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java @@ -564,17 +564,16 @@ public class PayOrderServiceImpl implements PayOrderService { * @param notify */ public void notifyOrder(PayOrderRespDTO notify) { - // 从payNo中解析组织id - Long organId = getOrganIdFromPayNo(notify.getOutTradeNo()); + String outTradeNo = notify.getOutTradeNo(); // 情况一:支付成功的回调 if (PayOrderStatusEnum.isSuccess(notify.getStatus())) { - notifyOrderSuccess(notify, organId); + notifyOrderSuccess(notify, outTradeNo); return; } // 情况二:支付失败的回调 if (PayOrderStatusEnum.isClosed(notify.getStatus())) { - notifyOrderClosed(notify, organId); + notifyOrderClosed(notify, outTradeNo); } } @@ -599,12 +598,11 @@ public class PayOrderServiceImpl implements PayOrderService { * * @param notify */ - private void notifyOrderSuccess(PayOrderRespDTO notify, Long organId) { + private void notifyOrderSuccess(PayOrderRespDTO notify, String outTradeNo) { // 1. 判断 PayOrderDO 是否处于待支付 - String outTradeNo = notify.getOutTradeNo(); PayOrderDO order = payOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(PayOrderDO::getPayNo, outTradeNo) - .eq(PayOrderDO::getOrganId, organId)); + .eq(PayOrderDO::getPayNo, outTradeNo)); + Long organId = order.getOrganId(); if (ObjectUtil.isNull(order)) { throw exception(PAY_ORDER_NOT_EXIST, outTradeNo); } @@ -734,12 +732,11 @@ public class PayOrderServiceImpl implements PayOrderService { * * @param notify */ - private void notifyOrderClosed(PayOrderRespDTO notify, Long organId) { + private void notifyOrderClosed(PayOrderRespDTO notify, String outTradeNo) { // 1. 查询 PayOrderDO - String outTradeNo = notify.getOutTradeNo(); PayOrderDO order = payOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(PayOrderDO::getPayNo, outTradeNo) - .eq(PayOrderDO::getOrganId, organId)); + .eq(PayOrderDO::getPayNo, outTradeNo)); + Long organId = order.getOrganId(); if (ObjectUtil.isNull(order)) { throw exception(PAY_ORDER_NOT_EXIST, outTradeNo); }