commit

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

@@ -115,10 +115,12 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
 
     public void updateExceptionReportResult(Integer source,String thirdReportNo,Integer breakContractParty){
         OrderChildExceptionReport report = orderChildExceptionReportDao.findByThirdReportNoAndSource(source,thirdReportNo);
+
         if(Objects.isNull(report)){
             log.warn("通过第三方上报编号：{} 未找到对应数据",thirdReportNo);
             throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
         }
+        Integer oldStatus = report.getStatus();
         if(Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.PROCESSED.getCode())
                 || Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.WITHDRAWN.getCode())){
             throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"异常数据已被处理或撤回");
@@ -128,6 +130,17 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         report.setStatus(CarrierExceptionReportEnum.Status.PROCESSED.getCode());
         report.setDealResult(breakContractParty);
         orderChildExceptionReportDao.updateEntityByKey(report);
+
+        if(Objects.equals(oldStatus,CarrierExceptionReportEnum.Status.APPEAL_IN_PROGRESS.getCode())){
+            saveOperationLog(report.getReportNo(),CarrierExceptionLogEnum.Type.APPEAL_DEAL,
+                    ExceptionReportEnum.DealResult.getNameByCode(breakContractParty),null,SyncPlatformEnum.Source.getNameByCode(source));
+        }else{
+            saveOperationLog(report.getReportNo(),CarrierExceptionLogEnum.Type.TIMEOUT,
+                    ExceptionReportEnum.DealResult.getNameByCode(breakContractParty),null,SyncPlatformEnum.Source.getNameByCode(source));
+        }
+
+
+
     }
 
     public void withdrawExceptionReport(Integer source,String thirdReportNo){
@@ -206,6 +219,7 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         if(Objects.equals(param.getDealWay(),ExceptionReportEnum.DealWay.APPEAL.getCode())  && StringUtils.isBlank(param.getAppealReason())){
             throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"申诉原因不能为空");
         }
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         if(Objects.equals(param.getDealWay(),ExceptionReportEnum.DealWay.APPEAL.getCode())){
             report.setStatus(CarrierExceptionReportEnum.Status.APPEAL_IN_PROGRESS.getCode());
@@ -217,7 +231,6 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
             dealLog.setVideoUrl(JSON.toJSONString(param.getVideoUrl()));
 
         }else{
-            UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
             report.setStatus(CarrierExceptionReportEnum.Status.PROCESSED.getCode());
             report.setDealTime(LocalDateTime.now());
             report.setDealResult(ExceptionReportEnum.DealResult.CARRIER_BREAK_CONTRACT.getCode());
@@ -256,12 +269,15 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
             log.info("结束通知：{} 上报异常处理，请求参数：{}",SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getName(),result);
 
         }
-
+        CarrierExceptionLogEnum.Type type = CarrierExceptionLogEnum.Type.AGREE;
+        String result = ExceptionReportEnum.DealResult.CARRIER_BREAK_CONTRACT.getName();
         orderChildExceptionReportDao.updateEntityByKey(report);
         if(Objects.nonNull(dealLog)){
             orderChildExceptionReportDealLogDao.saveEntity(dealLog);
+            type = CarrierExceptionLogEnum.Type.APPEAL;
+            result = null;
         }
-
+        saveOperationLog(report.getReportNo(),type,result,loginUserInfo.getUserNo(),loginUserInfo.getUserName());
     }
 
     @Override
@@ -358,9 +374,11 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
 
         //@TODO 创建司机违约记录
 
-
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         report.setTransferDriverBreakContract(1);
         orderChildExceptionReportDao.updateEntityByKey(report);
+        saveOperationLog(report.getReportNo(),CarrierExceptionLogEnum.Type.TRANSFER_DRIVER_BREAK_CONTRACT,null,loginUserInfo.getUserNo(),
+                loginUserInfo.getUserName());
     }
 
     public void saveOperationLog(String reportNo, CarrierExceptionLogEnum.Type type,String result,Long createBy,String createName){