Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcOpenapiController.java

@@ -35,4 +35,5 @@ public class KwcOpenapiController {
         kwcOpenapiService.eSignCallBack(reqVo);
         return HttpResult.ok();
     }
+
 }

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

@@ -7,8 +7,11 @@ import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.model.vo.req.ESignCallBackReqVo;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.order.api.dubbo.TradeOrderInfoService;
+import com.sckw.order.api.model.ContractSignCompletedParam;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +26,9 @@ public class CommonBusinessService {
     @DubboReference(version = "2.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    private TradeOrderInfoService tradeOrderInfoService;
+
     @Autowired
     private KwcContractTradeMapper kwcContractTradeMapper;
 
@@ -57,15 +63,31 @@ public class CommonBusinessService {
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractTrade)) {
             kwcContractTradeService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
+            notifyOrder(contractId, kwcContractTrade.getCreateBy());
             return;
         }
 
         KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractLogistics)) {
             kwcContractLogisticsService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
+            notifyOrder(contractId, kwcContractLogistics.getCreateBy());
             return;
         }
-
         throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
     }
+
+    /**
+     * @param contractId 合同id   userId用户id
+     * @desc: 通知订单模块更新状态
+     * @author: czh
+     * @date: 2023/8/14
+     */
+    private void notifyOrder(Long contractId, Long userId) {
+        ContractSignCompletedParam contractSignCompletedParam = new ContractSignCompletedParam();
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(userId);
+        contractSignCompletedParam.setContractId(contractId);
+        contractSignCompletedParam.setUpdateBy(userId);
+        contractSignCompletedParam.setUpdateByName(Objects.isNull(userCacheResDto) ? "" : userCacheResDto.getName());
+        tradeOrderInfoService.contractSignCompleted(contractSignCompletedParam);
+    }
 }