From c0e2097d0393540adcf5aa6ad9e6bb8cb897aa2b Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 3 Jul 2025 17:02:38 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E4=BC=98=E5=8C=96=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD&=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=8F=90=E4=BA=A4=E5=9C=A8=E7=BA=BF=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=BB=B6=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberBusinessServiceImpl.java     | 12 ++--------
 .../service/impl/SaOrderServiceImpl.java      | 22 +++++++++----------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
index 377244fe..1f2395d8 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
@@ -776,16 +776,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         List<CuMemberTradeDetail> cuMemberTradeDetailList = new ArrayList<>();
         CuMemberAccount updateMemberAccount = new CuMemberAccount();
         List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount);
-        R<TOnlinePayment> onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrder.getOrderCode());
-        TOnlinePayment onlinePayment = null;
-        if(ObjectUtil.isNotEmpty(onlinePaymentR)){
-            onlinePayment = onlinePaymentR.getData();
-        }
-        // 2025年7月2日 在线支付无视现金流水明细
-        if(ObjectUtil.isEmpty(onlinePayment)){
-            if (newCuMemberTradeBonusList.size() > 0) {
-                iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
-            }
+        if (newCuMemberTradeBonusList.size() > 0) {
+            iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
         }
         // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
         iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index 3fe04eaf..b474d5f3 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -2300,17 +2300,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
     public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) {
         SaOrderExt saOrderExt = myOrderVO.getSaOrderExt();
         BusinessCommissionDTO businessCommissionDTO = null;
-        R<TOnlinePayment> onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrderExt.getOrderCode());
-        TOnlinePayment onlinePayment = null;
-        if(ObjectUtil.isNotEmpty(onlinePaymentR)){
-            onlinePayment = onlinePaymentR.getData();
-            if(ObjectUtil.isNotEmpty(onlinePayment)){
-                R result = itOnlinePaymentServiceApi.refund(saOrderExt.getOrderCode(), SecurityUtils.getUserId());
-                if(!result.isSuccess()){
-                    throw new ServiceException(result.getMsg());
-                }
-            }
-        }
         if (ObjectUtil.isNotEmpty(saOrderExt)) {
             // 删除订单
             saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
@@ -2447,6 +2436,17 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                     throw new RuntimeException("撤单失败");
                 }
             }
+            R<TOnlinePayment> onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrderExt.getOrderCode());
+            TOnlinePayment onlinePayment;
+            if(ObjectUtil.isNotEmpty(onlinePaymentR)){
+                onlinePayment = onlinePaymentR.getData();
+                if(ObjectUtil.isNotEmpty(onlinePayment)){
+                    R result = itOnlinePaymentServiceApi.refund(saOrderExt.getOrderCode(), SecurityUtils.getUserId());
+                    if(!result.isSuccess()){
+                        throw new ServiceException(result.getMsg());
+                    }
+                }
+            }
             try {
                 // 验证订单是否有仓库，有仓库的可以回退，没有的回退
                 if (saOrderExt.getPkStorehouse() != null) {