commit

clx-performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractDriverRecordService.java

@@ -23,6 +23,8 @@ public interface BreakContractDriverRecordService  {
 
     IPage<DriverBreakContractDriverRecordVO> driverPageRecord(DriverPageBreakContractDriverRecordParam param);
 
+    String breakNoGenerate();
+
     void saveDriverRecordOfOrderChildCancel(OrderChild orderChild, Long createBy, String createName);
 
     void saveDriverRecordOfArriveSendAddressTimeout(OrderChild orderChild, Long createBy, String createName);

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

@@ -11,20 +11,21 @@ import com.clx.open.sdk.enums.ExceptionReportEnum;
 import com.clx.open.sdk.request.action.*;
 import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildExceptionReportDao;
 import com.clx.performance.dao.OrderChildExceptionReportDealLogDao;
 import com.clx.performance.dao.OrderChildExceptionReportOperationLogDao;
-import com.clx.performance.enums.CarrierExceptionLogEnum;
-import com.clx.performance.enums.CarrierExceptionReportEnum;
-import com.clx.performance.enums.ResultEnum;
-import com.clx.performance.enums.SyncPlatformEnum;
+import com.clx.performance.enums.*;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildExceptionReport;
 import com.clx.performance.model.OrderChildExceptionReportDealLog;
 import com.clx.performance.model.OrderChildExceptionReportOperationLog;
+import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
 import com.clx.performance.param.pc.DealExceptionReportParam;
 import com.clx.performance.param.pc.PageExceptionReportParam;
 import com.clx.performance.param.pc.TransferDriverBreakContractParam;
 import com.clx.performance.service.OrderChildExceptionReportService;
+import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.struct.OrderChildExceptionReportStruct;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.excel.ExcelData;
@@ -46,6 +47,7 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -68,6 +70,8 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
     private final RedisTemplate<String,Integer> redisTemplate;
     private final ThirdAppConfig thirdAppConfig;
     private final OrderChildExceptionReportOperationLogDao orderChildExceptionReportOperationLogDao;
+    private final BreakContractDriverRecordService breakContractDriverRecordService;
+    private final OrderChildDao orderChildDao;
 
     @Override
     public Result<String> smbSyncExceptionReportInfo(SmbSyncExceptionReportInfoAction action) {
@@ -390,4 +394,44 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         operationLog.setCreateName(createName);
         orderChildExceptionReportOperationLogDao.saveEntity(operationLog);
     }
+
+    public void saveDriverBreakContractRecord(OrderChildExceptionReport report){
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+        LocalDateTime time = LocalDateTime.now();
+
+        String breakNo = breakContractDriverRecordService.breakNoGenerate();
+        OrderChild orderChild = orderChildDao.getByChildNo(report.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+
+
+/*        BreakContractDriverRecord record = new BreakContractDriverRecord();
+        record.setBreakNo(breakNo);
+        record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
+        record.setFigure(param.getFigure());
+        record.setRemark(param.getRemark());
+
+        if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode())) {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode());
+            if (param.getTimeLimit() != null) {
+                record.setTimeLimit(param.getTimeLimit());
+                record.setLimitTime(time.plusSeconds(param.getTimeLimit().multiply(BigDecimal.valueOf(3600L)).intValue()));
+            }
+        }
+        else {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.PLATFORM.getCode());
+        }
+
+        record.setChildNo(param.getChildNo());
+        record.setTruckNo(orderChild.getTruckNo());
+        record.setTruckOwnUserNo(orderChild.getTruckOwnUserNo());
+        record.setTruckOwnName(orderChild.getTruckOwnName());
+        record.setDriverUserNo(orderChild.getDriverUserNo());
+        record.setDriverName(orderChild.getDriverName());
+
+        record.setCreateBy(userNo);
+        record.setCreateName(loginUserInfo.getUserName());
+        record.setCreateTime(time);
+
+        breakContractDriverRecordDao.saveEntity(record);*/
+    }
 }

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

@@ -128,7 +128,8 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
 
     }
 
-    private String breakNoGenerate() {
+    @Override
+    public String breakNoGenerate() {
         return "WYD"+uniqueOrderNumService.getUniqueOrderNum(
                 LocalDateTimeUtils.convertLocalDateTimeToString(LocalDateTime.now(), LocalDateTimeUtils.DATE_DAY));
     }