Merge branch 'dev' into dev-g

2026-04-20 02:55:04 +08:00 · 2025-02-28 09:48:49 +08:00
parent 2e8093ce2a 8f2b7f59f5
commit 29bb368430
8 changed files with 885 additions and 279 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -1498,6 +1498,7 @@ public class OrderService {
        if (StringUtils.isNotBlank(dto.getStopReason())) {
            int i = Integer.parseInt(dto.getStopReason(), 16);
            String stopReasonMsg = YKCChargingStopReasonEnum.getMsgByCode(i);
+            record.setStopReasonCode(dto.getStopReason()); // 故障原因码
            record.setReason(stopReasonMsg);
        }
        record.setTradeDate(DateUtils.parseDate(dto.getTradeTime()));