From ed10a0344261143ce195ffc366d49cbee2456320 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 13 Nov 2025 09:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=ABdebug=20?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/lakala/service/impl/LakalaApiServiceImpl.java   | 9 +--------
 .../service/impl/LklReceiveNotifyLogServiceImpl.java     | 8 ++++----
 mall-shop/src/main/resources/bootstrap-prod.yml          | 2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
index ff811016..8f96e232 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
@@ -820,7 +820,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
             return JSONUtil.createObj().set("code", "FAIL").set("message", "返回数据转换异常！");
         }
 
-        // 写上确认收货通知日志
+        // 不管成功与否，写入确认收货通知日志，后续补偿遗漏分账的材料
         lklReceiveNotifyLogService.addOrUpdate(paramsJSON.toString());
 
         // 订单是否为合单
@@ -873,16 +873,9 @@ public class LakalaApiServiceImpl implements LakalaApiService {
                 log.warn("[确认收货通知] 未能获取到商品子单信息，使用原始参数进行处理");
             }
         } else {
-
-            // 非合单订单，确认收货响应数据：{"trade_no":"20251015110110000066202154232129","log_no":"66202154232129","trade_state":"SUCCESS",
-            // "total_amount":"2950","trade_time":"20251015165538",
-            // "complete_notify_url":"https://mall.gpxscs.cn/api/mobile/shop/lakala/trans/receive/completeNotify",
-            // "merchant_no":"8226330541100H4","sub_mch_id":"812310610","origin_trade_no":"20251015110113130266250075936522",
-            // "origin_log_no":"66250075936522","origin_out_trade_no":"DD_20251015_2"}
             log.debug("[确认收货通知] 从订单信息中获取原始交易号: originTradeNo={} originLogNo={}", originTradeNo, originLogNo);
         }
 
-
         if (StrUtil.isBlank(tradeState) || !"SUCCESS".equals(tradeState)) {
             log.warn("[确认收货通知] 交易状态未成功，不做任何处理: tradeState={}", tradeState);
             return JSONUtil.createObj().set("code", "FAIL").set("message", "交易状态未成功，不做任何处理！");
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklReceiveNotifyLogServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklReceiveNotifyLogServiceImpl.java
index d24dbd95..d24d806f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklReceiveNotifyLogServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklReceiveNotifyLogServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.suisung.mall.common.constant.CommonConstant;
 import com.suisung.mall.common.modules.lakala.LklReceiveNotifyLog;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.lakala.mapper.LklReceiveNotifyLogMapper;
@@ -44,12 +43,11 @@ public class LklReceiveNotifyLogServiceImpl extends BaseServiceImpl<LklReceiveNo
                 log.warn("[LklReceiveNotifyLog] 新增或更新记录参数校验失败，订单号为空");
                 return false;
             }
-            
+
             // 直接构建记录对象
             LklReceiveNotifyLog record = new LklReceiveNotifyLog();
             record.setOrderId(orderId);
             record.setRespJson(lklReceiveNotifyJSON);
-            record.setStatus(CommonConstant.Disable2);
 
             // 使用 saveOrUpdate 方法替代先查询再判断的方式
             boolean result = saveOrUpdate(record,
@@ -65,7 +63,7 @@ public class LklReceiveNotifyLogServiceImpl extends BaseServiceImpl<LklReceiveNo
 
         } catch (Exception e) {
             log.error("[LklReceiveNotifyLog] 处理拉卡拉确认收货通知记录异常，通知数据={}",
-                    lklReceiveNotifyJSON.substring(0, Math.min(lklReceiveNotifyJSON.length(), 100)), e);
+                    lklReceiveNotifyJSON, e);
             return false;
         }
     }
@@ -88,6 +86,7 @@ public class LklReceiveNotifyLogServiceImpl extends BaseServiceImpl<LklReceiveNo
         try {
             log.debug("[LklReceiveNotifyLog] 开始查询拉卡拉确认收货通知记录，订单号={}", orderId);
 
+
             QueryWrapper<LklReceiveNotifyLog> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("order_id", orderId);
 
@@ -104,4 +103,5 @@ public class LklReceiveNotifyLogServiceImpl extends BaseServiceImpl<LklReceiveNo
             return null;
         }
     }
+
 }
diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml
index 62c03131..648b70c5 100644
--- a/mall-shop/src/main/resources/bootstrap-prod.yml
+++ b/mall-shop/src/main/resources/bootstrap-prod.yml
@@ -145,7 +145,7 @@ logging:
     com:
       suisung:
         mall:
-          shop: debug
+          shop: info
       sun:
         mail: error
       baomidou: error