autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 分账列表按照是否承担手续费排序，将承担手续费的用户排在最下面

Browse Source
This commit is contained in:
Lemon
2025-06-11 10:40:28 +08:00
parent d080b70373
commit 5545c2f434
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2133,6 +2133,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.info("订单结算金额:{}与需要分成的电费金额:{}+需要分成的服务费金额:{}不相等", afterSettleOrderDTO.getOrderSettleAmount(), orderElectricityAmount, orderServiceAmount); logger.info("订单结算金额:{}与需要分成的电费金额:{}+需要分成的服务费金额:{}不相等", afterSettleOrderDTO.getOrderSettleAmount(), orderElectricityAmount, orderServiceAmount);
return resultList; return resultList;
} }
// stationSplitConfigList按照是否承担手续费排序，将承担手续费的放在最后
stationSplitConfigList = stationSplitConfigList.stream()
.sorted(Comparator.comparing(
StationSplitConfig :: getFeeFlag
))
.collect(Collectors.toList());
// 定义两个变量, 分别保存剩余电费金额, 剩余服务费金额, 原始值需要分成的金额相等, 分账后减去响应金额, 最后剩余的金额分给手续费承担者 // 定义两个变量, 分别保存剩余电费金额, 剩余服务费金额, 原始值需要分成的金额相等, 分账后减去响应金额, 最后剩余的金额分给手续费承担者
BigDecimal remainElectricityAmount = orderElectricityAmount; BigDecimal remainElectricityAmount = orderElectricityAmount;
@@ -2275,9 +2281,29 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// } // }
public static void main(String[] args) { public static void main(String[] args) {
String dictValue = DictUtils.getDictValue("platform_service_flag", "status"); List<StationSplitConfig> stationSplitConfigList = new ArrayList<>();
StationSplitConfig a = new StationSplitConfig();
a.setAdapayMemberId("11111");
a.setFeeFlag("1");
stationSplitConfigList.add(a);
System.out.println(dictValue); StationSplitConfig b = new StationSplitConfig();
b.setAdapayMemberId("22222");
b.setFeeFlag("0");
stationSplitConfigList.add(b);
StationSplitConfig c = new StationSplitConfig();
c.setAdapayMemberId("33333");
c.setFeeFlag("0");
stationSplitConfigList.add(c);
stationSplitConfigList = stationSplitConfigList.stream()
.sorted(Comparator.comparing(
StationSplitConfig :: getFeeFlag
))
.collect(Collectors.toList());
System.out.println(stationSplitConfigList);
// BigDecimal orderElectricityAmount = new BigDecimal("100"); // BigDecimal orderElectricityAmount = new BigDecimal("100");
// BigDecimal orderServiceAmount = new BigDecimal("50");; // BigDecimal orderServiceAmount = new BigDecimal("50");;