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; - } - /** * 校验订单分账金额 *