Merge remote-tracking branch 'origin/v30.2_break_contract_20241021' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/pc/OrderChildExceptionReportController.java

@@ -60,7 +60,7 @@ public class OrderChildExceptionReportController {
     }
 
     @Operation(summary = "异常上报详情接口", description = "<br>By:刘海泉")
-    @PostMapping(value = "getExceptionReport")
+    @GetMapping(value = "getExceptionReport")
     public Result<OrderChildExceptionReportVO> getExceptionReport(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
         return Result.ok(orderChildExceptionReportService.getExceptionReport(id));
     }

clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -206,6 +206,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setReceiveWaitSystem(orderInfoFeign.getReveiveWaitSystem());
         orderGoodsVO.setReceiveWaitSystemName(orderInfoFeign.getReveiveWaitSystemName());
         orderGoodsVO.setReceiveWaitMode(orderInfoFeign.getReveiveWaitMode());
+        orderGoodsVO.setOrderSource(orderInfoFeign.getOrderSource());
 
         return orderGoodsVO;
     }

performance-api/src/main/java/com/clx/performance/enums/BreakContractRecordEnum.java

@@ -23,6 +23,10 @@ public enum BreakContractRecordEnum {
         public static Optional<TriggerType> getByCode(Integer code) {
             return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
         }
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(BreakContractRecordEnum.TriggerType::getMsg).orElse(null);
+        }
+
     }
     @Getter
     @AllArgsConstructor
@@ -38,6 +42,11 @@ public enum BreakContractRecordEnum {
         public static Optional<BreakContractPartyType> getByCode(Integer code) {
             return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
         }
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(BreakContractRecordEnum.BreakContractPartyType::getMsg).orElse(null);
+        }
+
+
     }
 
     @Getter

performance-api/src/main/java/com/clx/performance/vo/app/breakcontract/DriverBreakContractDriverRecordVO.java

 package com.clx.performance.vo.app.breakcontract;
 
 import com.alibaba.fastjson.JSON;
+import com.clx.performance.enums.BreakContractRecordEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -29,6 +30,11 @@ public class DriverBreakContractDriverRecordVO {
     @Schema(description="触发类型：1系统触发 2手动触发  3.异常上报")
     private Integer triggerType;
 
+    public String getTriggerTypeMsg(){
+        return BreakContractRecordEnum.TriggerType.getMsgByCode(triggerType);
+    }
+
+
     @Schema(description="违约方类型：1平台 2货主 3司机")
     private Integer breakContractPartyType;