autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WLOS-040] 改造白名单结算入口以支持异常/待结算并复用补偿逻辑

Browse Source
This commit is contained in:
Guoqs
2026-01-28 16:06:18 +08:00
parent 683f23fd93
commit 84f3807554
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -1513,21 +1513,16 @@ public class TempService {
throw new RuntimeException("订单号不存在：" + orderCode);
}
if (!Objects.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ABNORMAL.getValue())) {
if (!Objects.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ABNORMAL.getValue())
&& !Objects.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.STAY_SETTLEMENT.getValue())) {
throw new RuntimeException("订单不是异常订单：" + orderCode);
}
if (!Objects.equals(orderBasicInfo.getPayMode(), "3")) {
if (!Objects.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) {
throw new RuntimeException("订单不是白名单支付方式：" + orderCode);
}
ManualSettlementDTO build = ManualSettlementDTO.builder()
.chargingDegree("0")
.chargingAmount("0")
.orderCode(orderCode)
.build();
orderService.manualSettlementOrder(build);
orderService.completeWhitelistOrderIfNeeded(orderCode);
}
}