From 56daec15eafce28510d0e8881ebf3a1d3ed13f15 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 27 May 2025 21:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E6=9D=A1=E5=BC=82=E6=AD=A5=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=9B=9E=E8=B0=83=E7=9A=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LakalaApiServiceImpl.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 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 34e81d9d..bb10e897 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
@@ -538,7 +538,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
             domain += "/api";
         }
 
-        // 给拉卡拉通知的回调地址 TODO 生产环境一定去掉 api
+        // 给拉卡拉通知的回调地址
         String retUrl = domain + "/mobile/shop/lakala/ec/applyNotify";
         reqData.put("ret_url", retUrl);
 
@@ -1292,6 +1292,13 @@ public class LakalaApiServiceImpl implements LakalaApiService {
      * @param paramsJSON 包含绑定参数的JSON对象  {merCupNo}
      * @return 操作结果及提示信息
      */
+    /**
+     * 内部调用分账关系绑定申请（优化版）
+     * 参考：https://o.lakala.com/#/home/document/detail?id=386
+     *
+     * @param paramsJSON 包含绑定参数的JSON对象 {merCupNo}
+     * @return 操作结果及提示信息
+     */
     public Pair<Boolean, String> innerApplyLedgerMerReceiverBind(JSONObject paramsJSON) {
         // 1. 参数校验（提前失败）
         if (paramsJSON == null) {
@@ -1310,21 +1317,23 @@ public class LakalaApiServiceImpl implements LakalaApiService {
         }
 
         LklLedgerMember lklLedgerMember = lklLedgerMemberService.getByMerCupNo(merCupNo);
-        if (lklLedgerMember == null || !lklLedgerMember.getAudit_status().equals(CommonConstant.Enable)) {
+        if (lklLedgerMember == null || !CommonConstant.Enable.equals(lklLedgerMember.getAudit_status())) {
             return Pair.of(false, I18nUtil._("商家尚未申请分账业务"));
         }
 
-        // 是否有平台方或代理商记录
         List<LklLedgerReceiver> receiverList = lklLedgerReceiverService.selectPlatformAnDistributorList();
         if (CollectionUtil.isEmpty(receiverList)) {
-            return Pair.of(false, I18nUtil._("接收方信息为空"));
+            return Pair.of(false, I18nUtil._("分账接收方信息为空"));
         }
 
         // 3. 公共参数准备（避免循环内重复计算）
+        // 正式上线的时候，调整 api 地址
         String domain = projectDomain;
         if (isProdProject()) {
             domain += "/api";
         }
+
+        // 给拉卡拉通知的回调地址
         String retUrl = domain + "/mobile/shop/lakala/ledger/applyLedgerMerReceiverBindNotify";
         String entrustFileName = "小发同城合作协议书.pdf";
         String entrustFilePath = shopMchEntry.getLkl_ec_file_path();
@@ -1402,6 +1411,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
         }
     }
 
+
     /**
      * 分账关系绑定申请回调通知处理方法。
      * 接收拉卡拉平台异步通知，用于更新商家与接收方的绑定审核状态。