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

clx-performance-web/src/main/java/com/clx/performance/model/OrderChildExceptionReport.java

@@ -73,13 +73,13 @@ public class OrderChildExceptionReport implements HasKey<Integer> {
     private String reason;
 
 
-    @TableField("picture_url")
+    @TableField("picture_url_json")
     @Schema(description="图片")
-    private String pictureUrl;
+    private String pictureUrlJson;
 
-    @TableField("video_url")
+    @TableField("video_url_json")
     @Schema(description="视频")
-    private String videoUrl;
+    private String videoUrlJson;
 
     @TableField("deal_user_code")
     @Schema(description="处理人用户编码")

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

@@ -80,8 +80,8 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
     @Override
     public Result<String> smbSyncExceptionReportInfo(SmbSyncExceptionReportInfoAction action) {
         OrderChildExceptionReport report = orderChildExceptionReportStruct.convertInfoSmbAction(action);
-        report.setPictureUrl(JSON.toJSONString(action.getPictureUrl()));
-        report.setVideoUrl(JSON.toJSONString(action.getVideoUrl()));
+        report.setPictureUrlJson(JSON.toJSONString(action.getPictureUrl()));
+        report.setVideoUrlJson(JSON.toJSONString(action.getVideoUrl()));
         report.setExceptionCategory(action.getOneLevelName());
         report.setExceptionType(action.getTwoLevelName() + action.getThreeLevelName());
         return Result.ok(saveExceptionReportInfo(report, SyncPlatformEnum.Source.TRADE_PLATFORM.getCode()));
@@ -103,8 +103,8 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
     @Override
     public Result<String> mslSyncExceptionReportInfo(MslSyncExceptionReportInfoAction action) {
         OrderChildExceptionReport report = orderChildExceptionReportStruct.convertInfoMslAction(action);
-        report.setPictureUrl(JSON.toJSONString(action.getPictureUrl()));
-        report.setVideoUrl(JSON.toJSONString(action.getVideoUrl()));
+        report.setPictureUrlJson(JSON.toJSONString(action.getPictureUrl()));
+        report.setVideoUrlJson(JSON.toJSONString(action.getVideoUrl()));
         return Result.ok(saveExceptionReportInfo(report, SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode()));
     }
 
@@ -354,8 +354,8 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         OrderChildExceptionReport report = orderChildExceptionReportDao.getEntityByKey(id).orElseThrow(
                 ResultEnum.DATA_NOT_FIND);
         OrderChildExceptionReportVO vo = orderChildExceptionReportStruct.convert(report);
-        vo.setVideoUrlList(JSON.parseArray(report.getVideoUrl(),String.class));
-        vo.setPictureUrlList(JSON.parseArray(report.getPictureUrl(),String.class));
+        vo.setVideoUrlList(JSON.parseArray(report.getVideoUrlJson(),String.class));
+        vo.setPictureUrlList(JSON.parseArray(report.getPictureUrlJson(),String.class));
 
         Optional<OrderChildExceptionReportDealLog> limitOneByField = orderChildExceptionReportDealLogDao.getLimitOneByField(
                 OrderChildExceptionReportDealLog::getReportNo, report.getReportNo());