From 97441ca8875ac5f060b1f7c15118c8e875d6182b Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 28 Oct 2025 00:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=AF=94=E4=BE=8B=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopMchEntryServiceImpl.java     | 10 +++++++---
 .../service/impl/ShopStoreBaseServiceImpl.java    | 15 +++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
index dd1ceabb..1605ea04 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
@@ -928,8 +928,6 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
             return CommonResult.failed("商家入驻记录不存在！");
         }
 
-        // 分账比例，最终提交给拉卡拉的分账比例是 20%。
-        BigDecimal splitRatio = getMchEntryRatioOrDefault(shopMchEntry.getBiz_category(), shopMchEntry.getBiz_second_category(), shopMchEntry.getSplit_ratio(), new BigDecimal(94));
 
         // 如果是驳回状态，直接返回成功消息
         if (approvalStatus.equals(CommonConstant.MCH_APPR_STA_NOPASS)) {
@@ -955,7 +953,13 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
         shopMchEntry.setApproval_invalid_col(approvalInvalidCol);
         shopMchEntry.setUpdated_by(userId);
         shopMchEntry.setSettlement_method(1); // 结算类型：0-秒到（不分账）；1-次日结算（需要分账）
-        shopMchEntry.setSplit_ratio(splitRatio);
+        // 分账比例，最终提交给拉卡拉的分账比例是 20%。
+        BigDecimal splitRatio = shopMchEntry.getSplit_ratio();
+        if (CheckUtil.isEmpty(splitRatio)) {
+            splitRatio = getMchEntryRatioOrDefault(shopMchEntry.getBiz_category(), shopMchEntry.getBiz_second_category(), shopMchEntry.getSplit_ratio(), new BigDecimal(94));
+            shopMchEntry.setSplit_ratio(splitRatio);
+        }
+
 
         // 店铺省市区处理
         String[] result = handleStoreDistrictInfo(shopMchEntry.getStore_district(), shopMchEntry.getStore_area(), shopMchEntry.getStore_address());
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index b0d188f8..fc376d19 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -3206,12 +3206,15 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
                         CheckUtil.isNotEmpty(shopMchEntry.getBiz_second_category()) ? shopMchEntry.getBiz_second_category() : 0);
             }
 
-            // 计算分账比例
-            BigDecimal splitRatio = shopMchEntryService.getMchEntryRatioOrDefault(
-                    shopMchEntry.getBiz_category(),
-                    shopMchEntry.getBiz_second_category(),
-                    shopMchEntry.getSplit_ratio(),
-                    new BigDecimal(94));
+            BigDecimal splitRatio = shopMchEntry.getSplit_ratio();
+            if (CheckUtil.isEmpty(splitRatio)) {
+                // 计算分账比例
+                splitRatio = shopMchEntryService.getMchEntryRatioOrDefault(
+                        shopMchEntry.getBiz_category(),
+                        shopMchEntry.getBiz_second_category(),
+                        shopMchEntry.getSplit_ratio(),
+                        new BigDecimal(94));
+            }
 
             if (CheckUtil.isEmpty(shopStoreBase.getSplit_ratio())) {
                 shopStoreBase.setSplit_ratio(splitRatio);