From 5b61f2d968612fbfe1ac34f475e9d1259df9150c Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 4 Jun 2024 15:31:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NotDelayMerchantProgramLogic.java         | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
index e1855617b..28c440855 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
@@ -486,26 +486,50 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
         List<OrderDetailInfoVO.OrderRefundInfo> resultList = Lists.newArrayList();
 
         // 查到原汇付支付id
-        AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode());
-        if (adapayCallbackRecord == null) {
+        // AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode());
+        // if (adapayCallbackRecord == null) {
+        //     return resultList;
+        // }
+
+        List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderBasicInfo.getOrderCode());
+        if (CollectionUtils.isEmpty(orderPayRecordList)) {
             return resultList;
         }
+        List<String> paymentIdList = Lists.newArrayList();
+        for (OrderPayRecord orderPayRecord : orderPayRecordList) {
+            String payMode = orderPayRecord.getPayMode();
+            if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())
+                    || StringUtils.equals(payMode, OrderPayRecordEnum.ALIPAY_PAYMENT.getValue())) {
+                List<String> idList = orderPayRecordService.parsePaymentIdByDeductionRecord(orderPayRecord.getDeductionRecord());
+                paymentIdList.addAll(idList);
+            }
+        }
 
         // 获取appId
         String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId());
 
         // 通过支付id查询退款记录
-        String paymentId = adapayCallbackRecord.getPaymentId();
-        List<RefundInfo> refundInfos = null;
-        try {
-            refundInfos = adapayService.queryPaymentRefund(paymentId, wechatAppId);
-        } catch (BaseAdaPayException e) {
-            logger.error("查询支付撤销对象发生异常", e);
+        List<RefundInfo> refundInfoList = Lists.newArrayList();
+        for (String paymentId : paymentIdList) {
+            try {
+                List<RefundInfo> refundInfos = adapayService.queryPaymentRefund(paymentId, wechatAppId);
+                if (CollectionUtils.isNotEmpty(refundInfos)) {
+                    refundInfoList.addAll(refundInfos);
+                }
+            } catch (BaseAdaPayException e) {
+                logger.error("查询支付退款对象发生异常", e);
+            }
         }
+        // String paymentId = adapayCallbackRecord.getPaymentId();
+        // try {
+        //     refundInfoList = adapayService.queryPaymentRefund(paymentId, wechatAppId);
+        // } catch (BaseAdaPayException e) {
+        //     logger.error("查询支付退款对象发生异常", e);
+        // }
 
         OrderDetailInfoVO.OrderRefundInfo refundInfo;
-        if (CollectionUtils.isNotEmpty(refundInfos)) {
-            for (RefundInfo refund : refundInfos) {
+        if (CollectionUtils.isNotEmpty(refundInfoList)) {
+            for (RefundInfo refund : refundInfoList) {
                 refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
                 refundInfo.setReverseId(refund.getRefund_id());
                 refundInfo.setPaymentId(refund.getPayment_id());