修改合同签约时间

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -1,5 +1,6 @@
 package com.sckw.contract.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -143,9 +144,10 @@ public class CommonBusinessService {
     public void approval(ESignCallBackReqVo reqVo) {
         Long contractId = reqVo.getContractId();
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
+        Date date = DateUtil.offsetSecond(new Date(), Global.NUMERICAL_TWO);
         if (Objects.nonNull(kwcContractTrade)) {
             kwcContractTradeService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
-            kwcContractTradeTrackService.saveContractTradeTrack(contractId, reqVo.getStatus());
+            kwcContractTradeTrackService.saveContractTradeTrack(contractId, reqVo.getStatus(), date);
             notifyOrder(contractId, kwcContractTrade.getCreateBy());
             sendTradePassMessage(kwcContractTrade);
             return;
@@ -154,7 +156,7 @@ public class CommonBusinessService {
         KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractLogistics)) {
             kwcContractLogisticsService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
-            kwcContractLogisticsTrackService.saveContractLogisticsTrack(contractId, reqVo.getStatus());
+            kwcContractLogisticsTrackService.saveContractLogisticsTrack(contractId, reqVo.getStatus(), date);
             notifyOrder(contractId, kwcContractLogistics.getCreateBy());
             sendLogisticsPassMessage(kwcContractLogistics);
             return;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -520,7 +520,7 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistics) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id, ContractTrackEnum.SIGNING.getCode());
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id, ContractTrackEnum.SIGNING.getCode(), new Date());
     }
 
 
@@ -627,7 +627,7 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistic) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractLogisticsTrackService.saveContractLogisticsTrack(kwcContractLogistic.getId(), ContractTrackEnum.OVER.getCode());
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(kwcContractLogistic.getId(), ContractTrackEnum.OVER.getCode(), new Date());
 
 
         //发送消息

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsTrackService.java

@@ -50,10 +50,8 @@ public class KwcContractLogisticsTrackService {
      * @author: czh
      * @date: 2023/7/14
      */
-    public void saveContractLogisticsTrack(Long contractId, Integer status) {
+    public void saveContractLogisticsTrack(Long contractId, Integer status, Date date) {
         KwcContractLogisticsTrack kwcContractLogisticsTrack = new KwcContractLogisticsTrack();
-        Date date = new Date();
-        date = DateUtil.offsetSecond(date, Global.NUMERICAL_TWO);
         kwcContractLogisticsTrack.setId(new IdWorker(1L).nextId());
         kwcContractLogisticsTrack.setContractId(contractId);
         kwcContractLogisticsTrack.setType(status);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -599,7 +599,7 @@ public class KwcContractTradeService {
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractTradeTrackService.saveContractTradeTrack(id, code);
+        kwcContractTradeTrackService.saveContractTradeTrack(id, code, new Date());
     }
 
     /**
@@ -704,7 +704,7 @@ public class KwcContractTradeService {
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractTradeTrackService.saveContractTradeTrack(kwcContractTrade.getId(), ContractTrackEnum.OVER.getCode());
+        kwcContractTradeTrackService.saveContractTradeTrack(kwcContractTrade.getId(), ContractTrackEnum.OVER.getCode(), new Date());
 
         //完结相关订单
         ContractSignCompletedParam contractSignCompletedParam = new ContractSignCompletedParam();

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeTrackService.java

@@ -44,9 +44,7 @@ public class KwcContractTradeTrackService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    public void saveContractTradeTrack(Long contractId, Integer status) {
-        Date date = new Date();
-        date = DateUtil.offsetSecond(date, Global.NUMERICAL_TWO);
+    public void saveContractTradeTrack(Long contractId, Integer status, Date date) {
         KwcContractTradeTrack kwcContractTradeTrack = new KwcContractTradeTrack();
         kwcContractTradeTrack.setId(new IdWorker(1L).nextId());
         kwcContractTradeTrack.setContractId(contractId);