From 8e6ff033953803e82e3106846d8f747b2122fe65 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 20 Aug 2025 17:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E9=A9=BB=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/impl/ShopMchEntryServiceImpl.java  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 0cb6bb35..051db328 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
@@ -696,16 +696,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
         }
 
         // 查询入驻记录
-//        QueryWrapper<ShopMchEntry> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("id", mchId);
-//        ShopMchEntry record = findOne(queryWrapper);
         ShopMchEntry record = get(mchId);
         if (record == null) {
             return CommonResult.failed("商家入驻记录不存在！");
         }
 
-//        log.debug("###提交拉卡拉前，更新的记录 {}###", JSONUtil.toJsonStr(record));
-
         // 自动计算商家分成比例
         BigDecimal splitRatio = shopBaseStoreCategoryService.getStoreCategoryRatio(record.getBiz_category());
         if (splitRatio == null || splitRatio.compareTo(BigDecimal.ZERO) <= 0) {
@@ -740,8 +735,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
 
         // 转换拉卡拉的日期格式 yyyy-MM-dd
         record = convLklDateFormat(record);
-
-//        log.debug("###提交拉卡拉时，更新的记录 {}###", JSONUtil.toJsonStr(record));
+        if (record.getSettlement_method() == null
+                || record.getSettlement_method() < 0
+                || record.getSettlement_method() > 1) {
+            record.setSettlement_method(0); // 结算类型：0-秒到；1-次日结算
+        }
 
         // 执行更新操作
         if (!updateById(record)) {