bugfix

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

@@ -348,18 +348,29 @@ public class KwcContractLogisticsService {
         if (Objects.isNull(id)) {
             id = addCheckedContract(reqVo);
             changeToSubmit(id);
+            sign(reqVo, id);
             return id;
         }
         update(reqVo);
         changeToSubmit(id);
+        sign(reqVo, id);
+        return id;
+    }
 
+    /**
+     * @param reqVo 入参 id合同id
+     * @desc: 签约
+     * @author: czh
+     * @date: 2023/8/18
+     */
+    private void sign(ContractLogisticsReqVo reqVo, Long id) {
         if (DictEnum.SIGNING_WAY_1.getValue().equals(String.valueOf(reqVo.getBaseInfo().getSigningWay()))) {
             commonBusinessService.postToEsign(reqVo.getBaseInfo().getCheckedPhone(),
                                               reqVo.getBaseInfo().getCarrierPhone(),
                                               reqVo.getBaseInfo().getCheckedEntId(),
                                               reqVo.getBaseInfo().getCarrierEntId(),
                                               reqVo.getContractFile(),
-                                              id,
+                    id,
                                               reqVo.getBaseInfo().getContractName());
         }
 
@@ -370,14 +381,9 @@ public class KwcContractLogisticsService {
             eSignCallBackReqVo.setStatus(ContractStatusEnum.SIGNED.getCode());
             commonBusinessService.approval(eSignCallBackReqVo);
         }
-        return id;
     }
 
 
-
-
-
-
     /**
      * @param id 合同id
      * @desc: 更新合同为发起