From fc72297f2ae3a6e94d661fe5aee1b268730bd38e Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Fri, 22 Aug 2025 12:14:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=B5=81=E7=A8=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/suisung/mall/common/modules/store/ShopMchEntry.java | 2 +- .../mall/shop/lakala/service/impl/LakalaApiServiceImpl.java | 6 +++--- mall-shop/src/main/resources/bootstrap-dev.yml | 4 ++-- mall-shop/src/main/resources/bootstrap-test.yml | 4 ++-- mall-shop/src/main/resources/bootstrap-uat.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java index a986f2a1..bc774c98 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java @@ -60,7 +60,7 @@ public class ShopMchEntry implements Serializable { @ApiModelProperty(value = "除去运费的商家分成比列，如：95.00，最大100，最小0") private BigDecimal split_ratio; - @ApiModelProperty(value = "分账到账方式：1-T+0；2-T+1，3-T+3...") + @ApiModelProperty(value = "结算类型：0-秒到（不分账）；1-次日结算（分账）") private Integer settlement_method; @ApiModelProperty(value = "商家入驻合同的编号") 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 04e1f4e7..76bde410 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 @@ -1303,7 +1303,7 @@ public class LakalaApiServiceImpl implements LakalaApiService { JSONObject respJson = JSONUtil.parseObj(responseStr); if (respJson == null || !lklSuccessCode.equals(respJson.getStr("retCode"))) { - log.error("拉卡拉响应失败：{}", respJson != null ? respJson.getStr("retMsg") : "无响应数据"); + log.error("绑定接收方拉卡拉响应失败：{}", respJson != null ? respJson.getStr("retMsg") : "无响应数据"); continue; // 单个失败不影响其他接收方处理 } @@ -1342,9 +1342,9 @@ public class LakalaApiServiceImpl implements LakalaApiService { } return Pair.of(false, "分账接收方绑定失败"); } else if (successCount < totalCount) { - return Pair.of(true, "部分提交成功（" + successCount + "/" + totalCount + "），待审核中"); + return Pair.of(true, "分账接收方绑定，部分提交成功（" + successCount + "/" + totalCount + "），待审核中"); } else { - return Pair.of(true, "全部提交成功，待审核中"); + return Pair.of(true, "分账接收方绑定，全部提交成功，待审核中"); } } diff --git a/mall-shop/src/main/resources/bootstrap-dev.yml b/mall-shop/src/main/resources/bootstrap-dev.yml index 4e4f92d7..30b4a3a6 100644 --- a/mall-shop/src/main/resources/bootstrap-dev.yml +++ b/mall-shop/src/main/resources/bootstrap-dev.yml @@ -163,11 +163,11 @@ lakala: # 拉卡拉拓客进件配置 tk: #服务地址 - server_url: https://test.wsmsd.cn/sit/htkauth + server_url: https://test.wsmsd.cn client_id: lsycs client_secret: XPa1HB5d55Ig0qV8 user_no: 29153396 - ratio: 70.00 + split_lowest_ratio: 70.00 activity_id: 687 wx_fee: 0.6 # 微信手续费 6/1000 api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml index e3a0e20c..a92302ac 100644 --- a/mall-shop/src/main/resources/bootstrap-test.yml +++ b/mall-shop/src/main/resources/bootstrap-test.yml @@ -167,11 +167,11 @@ lakala: # 拉卡拉拓客进件配置 tk: #服务地址 - server_url: https://test.wsmsd.cn/sit/htkauth + server_url: https://test.wsmsd.cn client_id: lsycs client_secret: XPa1HB5d55Ig0qV8 user_no: 29153396 - ratio: 70.00 + split_lowest_ratio: 70.00 activity_id: 687 wx_fee: 0.6 # 微信手续费 6/1000 api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt diff --git a/mall-shop/src/main/resources/bootstrap-uat.yml b/mall-shop/src/main/resources/bootstrap-uat.yml index e3a0e20c..a92302ac 100644 --- a/mall-shop/src/main/resources/bootstrap-uat.yml +++ b/mall-shop/src/main/resources/bootstrap-uat.yml @@ -167,11 +167,11 @@ lakala: # 拉卡拉拓客进件配置 tk: #服务地址 - server_url: https://test.wsmsd.cn/sit/htkauth + server_url: https://test.wsmsd.cn client_id: lsycs client_secret: XPa1HB5d55Ig0qV8 user_no: 29153396 - ratio: 70.00 + split_lowest_ratio: 70.00 activity_id: 687 wx_fee: 0.6 # 微信手续费 6/1000 api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt