From 93fa75f487f1672ef4e5f1b608421adbd9b7b040 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 14 Oct 2025 12:05:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controller/admin/PayController.java   | 22 ++++++++++++++-----
 .../impl/ShopOrderBaseServiceImpl.java        | 22 ++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java
index fa853514..8ade5abc 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java
@@ -139,15 +139,27 @@ public class PayController {
 
     @RequestMapping(value = "/saveOrUpdatePayConsumeTrade", method = RequestMethod.POST)
     public boolean saveOrUpdatePayConsumeTrade(@RequestBody PayConsumeTrade payConsumeTrade) {
-        boolean flag = false;
-        try {
-            flag = payConsumeTradeService.saveOrUpdate(payConsumeTrade);
-        } catch (Exception e) {
+        // 参数校验
+        if (payConsumeTrade == null) {
+            logger.warn("[保存或更新交易记录] 参数校验失败：payConsumeTrade 为空");
+            return false;
+        }
+
+        try {
+            boolean flag = payConsumeTradeService.saveOrUpdate(payConsumeTrade);
+            if (flag) {
+                logger.debug("[保存或更新交易记录] 操作成功，tradeId: {}", payConsumeTrade.getConsume_trade_id());
+            } else {
+                logger.warn("[保存或更新交易记录] 操作失败，tradeId: {}", payConsumeTrade.getConsume_trade_id());
+            }
+            return flag;
+        } catch (Exception e) {
+            logger.error("[保存或更新交易记录] 系统异常，tradeId: {}", payConsumeTrade.getConsume_trade_id(), e);
             return false;
         }
-        return flag;
     }
 
+
     @RequestMapping(value = "/saveOrUpdatePayUserResource", method = RequestMethod.POST)
     public boolean saveOrUpdatePayUserResource(@RequestBody PayUserResource payUserResource) {
         boolean flag;
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index f70101f7..1c596304 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -3303,7 +3303,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
 
                     // RMK 第三方数据同步相关：redis 给这个商品减去对应的库存
                     Map<String, Integer> stockDeltaMap = new HashMap<>();
-                    stockDeltaMap.put(item_src_id+"_"+order_item_row.getOrder_id(), -order_item_quantity);
+                    stockDeltaMap.put(item_src_id + "_" + order_item_row.getOrder_id(), -order_item_quantity);
                     syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
                 }
             }
@@ -4226,7 +4226,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     log.debug("释放库存Item_src_id:{},数量：{}", shopProductItem.getItem_src_id(), order_item_quantity);
                     // RMK 第三方数据同步相关：redis 给这个商品加上对应的库存
                     Map<String, Integer> stockDeltaMap = new HashMap<>();
-                    stockDeltaMap.put(shopProductItem.getItem_src_id()+"_"+order_item_row.getOrder_id(), order_item_quantity);
+                    stockDeltaMap.put(shopProductItem.getItem_src_id() + "_" + order_item_row.getOrder_id(), order_item_quantity);
                     syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
                 }
             }
@@ -6523,7 +6523,20 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
 
                 // 订单信息保存处理
                 if (flag) {
-                    String product_item_name = item_items.stream().map(s -> Convert.toStr(s.get("product_item_name"))).collect(Collectors.joining("|"));
+                    // 订单商品标题
+                    // String product_item_name = item_items.stream().map(s -> Convert.toStr(s.get("product_item_name"))).collect(Collectors.joining("|"));
+                    String product_item_name = "";
+                    if (CollUtil.isNotEmpty(item_items)) {
+                        String firstProductName = Convert.toStr(item_items.get(0).get("product_item_name"));
+                        if (StrUtil.isNotBlank(firstProductName)) {
+                            // 限制长度，防止超出字段限制
+                            if (firstProductName.length() > 100) {
+                                firstProductName = firstProductName.substring(0, 100);
+                            }
+                            product_item_name = firstProductName + "等商品";
+                        }
+                    }
+
                     Integer subsite_id = (Integer) store_item.get("subsite_id");
                     Integer store_is_selfsupport = (Integer) store_item.get("store_is_selfsupport");
                     Integer payment_type_id = (Integer) checkout_row.get("payment_type_id");
@@ -7244,7 +7257,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                                 // RMK 第三方数据同步相关：redis 给这个商品减去上对应的库存
                                 log.debug("减库存Item_src_id:{},数量：{}", item_src_id, cart_quantity);
                                 Map<String, Integer> stockDeltaMap = new HashMap<>();
-                                stockDeltaMap.put(item_src_id+"_"+order_id, -cart_quantity);
+                                stockDeltaMap.put(item_src_id + "_" + order_id, -cart_quantity);
                                 syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
 
                             }
@@ -7877,7 +7890,6 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     consume_trade_row.setTrade_day(info_row.getOrder_day()); // 日
                     consume_trade_row.setTrade_title(info_row.getOrder_title()); // 标题
 
-
                     if (!payService.saveOrUpdatePayConsumeTrade(consume_trade_row)) {
                         throw new ApiException(I18nUtil._("订单支付信息失败!"));
                     } else {