From c0e6215f3687c05608a1b3d5bb2935430cbb8c0e Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 15 Oct 2025 21:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81bug=20fix=EF=BC=8C=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/common/service/impl/UniCloudPushServiceImpl.java  | 6 +++---
 .../mall/pay/service/impl/PayConsumeTradeServiceImpl.java  | 7 ++++---
 .../order/service/impl/ShopOrderReturnServiceImpl.java     | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/service/impl/UniCloudPushServiceImpl.java b/mall-common/src/main/java/com/suisung/mall/common/service/impl/UniCloudPushServiceImpl.java
index 0569d890..ad3021b8 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/service/impl/UniCloudPushServiceImpl.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/service/impl/UniCloudPushServiceImpl.java
@@ -146,10 +146,10 @@ public class UniCloudPushServiceImpl implements UniCloudPushService {
 
         request.put("push_clientid", distinctClientIds)
                 .put("title", title)
-                .put("content", content)
-                .put("message_id", messageId); // 添加唯一消息ID
+                .put("content", content); // 添加唯一消息ID
 
         if (payload != null) {
+            payload.set("message_id", messageId);
             request.put("payload", payload);
         }
 
@@ -157,7 +157,7 @@ public class UniCloudPushServiceImpl implements UniCloudPushService {
         log.debug("[推送服务] 请求参数: {}", request);
         return request;
     }
-    
+
     /**
      * 处理推送响应
      */
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
index 3cc53738..6d58007c 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
@@ -188,7 +188,7 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
      * @param points        积分支付,此处为积分转换的支付额度。
      * @param credit        信用支付
      * @param redpack       红包支付
-     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   todo 没有增量更新数据
+     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       todo 没有增量更新数据
      */
     // todo 优化逻辑
     @Override
@@ -1433,7 +1433,7 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
 //                                            throw new ApiException(I18nUtil._("用户退款失败！"));
 //                                        }
 
-                                        throw new ApiException(I18nUtil._("退款原路返回失败！"));
+                                        throw new ApiException(I18nUtil._("退款失败，请联系客服后重试"));
                                     }
                                 }
 
@@ -1594,7 +1594,8 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
                 }
             } catch (ApiException e) {
                 // 捕获业务异常，记录日志并继续处理下一个退货单
-                log.error("处理退货单异常, returnRow:{}, error:{}", returnRow, e.getMessage());
+                log.error("处理退货单异常 returnRow:{}, error:{}", returnRow, e.getMessage());
+                throw new ApiException(I18nUtil._("退款失败，请联系客服后重试"));
             }
         }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index 3a396142..6708e474 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -1726,7 +1726,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             // 卖家账户扣款，买家账户增加
             // 佣金问题
 
-            shopOrderReturn.setReturn_is_paid(1); // 0-退货未完成；1-退货完成
+            shopOrderReturn.setReturn_is_paid(CommonConstant.Enable); // 0-退货未完成；1-退货完成
             shopOrderReturn.setReturn_finish_time(now);
 
             List<ShopOrderReturn> returnOrder = new ArrayList<>();