From 71ff3e4148b3b863561ff4fa9876df6a3560d934 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 29 Nov 2024 15:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=AF=8F=E4=B8=AA=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E8=A6=81=E5=88=86=E8=B4=A6=E7=9A=84=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderBasicInfoServiceImpl.java | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index bbf68d85a..bd25a28dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1686,6 +1686,29 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } + /** + * 计算每个账户需要分账的金额 + * @param stationSplitConfigList 参与分账的账户信息 + * @param settleAmount 订单总结算金额 + * @param paymentInfos 支付记录信息 + * @return + */ + private List splitAmount(List stationSplitConfigList, BigDecimal settleAmount, List paymentInfos) { + // 校验stationSplitConfigList中电费分成比例相加等于100% + BigDecimal totalElecSplitRatio = stationSplitConfigList.stream().map(StationSplitConfig::getElectricitySplitRatio).reduce(BigDecimal.ZERO, BigDecimal::add); + // 校验stationSplitConfigList中服务费分成比例相加等于100% + BigDecimal totalServiceSplitRatio = stationSplitConfigList.stream().map(StationSplitConfig::getServiceSplitRatio).reduce(BigDecimal.ZERO, BigDecimal::add); + + // totalElecSplitRatio和totalServiceSplitRatio 都等于100%, 才进行后续操作 + if (totalElecSplitRatio.compareTo(BigDecimal.valueOf(100)) == 0 && totalServiceSplitRatio.compareTo(BigDecimal.valueOf(100)) == 0) { + + } + + List resultList = Lists.newArrayList(); + + return resultList; + } + /** * 执行订单退款 */ @@ -1696,21 +1719,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { orderLogic.refundOrder(afterSettleOrderDTO.getOrderBasicInfo()); } - /** - * 计算每个账户需要分账的金额 - * @param shareMemberList 参与分账的账户信息 - * @param settleAmount 订单总结算金额 - * @param paymentInfos 支付记录信息 - * @return - */ - private List splitAmount(List shareMemberList, BigDecimal settleAmount, List paymentInfos) { - List resultList = Lists.newArrayList(); - - - - return resultList; - } - /** * 校验订单分账金额 *