From c5f5978b4127054d5b98f9eb63ba66825f75cc3a Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Thu, 13 Nov 2025 10:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E8=AE=A1=E7=AE=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/LklSeparateWithTotalAmountDTO.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/LklSeparateWithTotalAmountDTO.java b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/LklSeparateWithTotalAmountDTO.java index 25847999..be215f5f 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/LklSeparateWithTotalAmountDTO.java +++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/LklSeparateWithTotalAmountDTO.java @@ -345,7 +345,7 @@ public class LklSeparateWithTotalAmountDTO { // 2. 校验实际可分账金额不能小于0 if (actualCanSeparateAmount < 0) { - return Pair.of(false, "实际可分账金额不能为负数"); + return Pair.of(false, "实际可分账金额不能小于0"); } // 3. 初始化剩余金额为实际可分账金额 @@ -358,7 +358,7 @@ public class LklSeparateWithTotalAmountDTO { // 校验平台分账金额不能为负数 if (platAmount < 0) { - return Pair.of(false, "平台分账金额计算异常"); + return Pair.of(false, "平台分账金额不能小于0"); } // 确保不超过剩余金额 @@ -383,7 +383,7 @@ public class LklSeparateWithTotalAmountDTO { // 校验二级代理商分账金额不能为负数 if (agent2ndAmount < 0) { - return Pair.of(false, "二级代理商分账金额计算异常"); + return Pair.of(false, "二级代理商分账金额不能小于0"); } // 确保不超过剩余金额 @@ -401,7 +401,7 @@ public class LklSeparateWithTotalAmountDTO { // 校验一级代理商分账金额不能为负数 if (agent1stAmount < 0) { - return Pair.of(false, "一级代理商分账金额计算异常"); + return Pair.of(false, "一级代理商分账金额不能小于0"); } // 确保不超过剩余金额 @@ -416,7 +416,7 @@ public class LklSeparateWithTotalAmountDTO { // 校验商家分账金额不能为负数 if (mchAmount < 0) { - return Pair.of(false, "商家分账金额计算异常"); + return Pair.of(false, "商家分账金额不能小于0"); } return Pair.of(true, ""); @@ -439,7 +439,7 @@ public class LklSeparateWithTotalAmountDTO { String errorMsg = String.format("警告: 商家实际分账比例低于阈值,当前比例: %s,阈值: %s", mchRatio.toPlainString(), MCH_RATIO_THRESHOLD.toPlainString()); log.warn(errorMsg); - return Pair.of(false, "商家分账低于阈值"); + return Pair.of(false, errorMsg); } } @@ -461,7 +461,7 @@ public class LklSeparateWithTotalAmountDTO { if (totalAmount > getValueOrZero(totalSeparateAmount)) { String errorMsg = String.format("分账金额总和(%d)超过总金额(%d)", totalAmount, getValueOrZero(totalSeparateAmount)); - return Pair.of(false, "分账金额总和超过总金额: " + errorMsg); + return Pair.of(false, errorMsg); } return Pair.of(true, "");