e签宝回调

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

@@ -15,6 +15,7 @@ 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;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,7 @@ public class CommonBusinessService {
      * @author: czh
      * @date: 2023/8/14
      */
+    @Transactional(rollbackFor = {})
     public void approval(ESignCallBackReqVo reqVo) {
         Long contractId = reqVo.getContractId();
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);

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

@@ -38,6 +38,7 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.extern.slf4j.Slf4j;
@@ -356,6 +357,12 @@ public class KwcContractLogisticsService {
         return id;
     }
 
+    /**
+     * @param reqVo  发起签约入参 id合同id
+     * @desc: 调e签宝
+     * @author: czh
+     * @date: 2023/8/14
+     */
     private void postToEsign(ContractLogisticsReqVo reqVo, Long id) {
         EsignGetFlowReqDto esignGetFlowReqDto = new EsignGetFlowReqDto();
         JSONArray jsonArray = JSONArray.parseArray(reqVo.getContractFile());
@@ -366,17 +373,23 @@ public class KwcContractLogisticsService {
 
         Long carrierEntId = reqVo.getBaseInfo().getCarrierEntId();
         Long checkedEntId = reqVo.getBaseInfo().getCheckedEntId();
+        List<Long> entIds = new ArrayList<>(2);
+        entIds.add(carrierEntId);
+        entIds.add(checkedEntId);
+        Map<Long,EntCacheResDto> longListMap = remoteSystemService.queryEntCacheMapByIds(entIds);
 
 
         esignGetFlowReqDto.setFile(file);
         esignGetFlowReqDto.setSeqId(String.valueOf(id));
         esignGetFlowReqDto.setSignFlowTitle(reqVo.getBaseInfo().getContractName());
-        esignGetFlowReqDto.setOrgFirstName("");
-        esignGetFlowReqDto.setPsnFirstAccount("");
-        esignGetFlowReqDto.setOrgSecondName("");
-        esignGetFlowReqDto.setPsnSecondAccount("");
+        esignGetFlowReqDto.setOrgFirstName(longListMap.get(checkedEntId).getFirmName());
+        esignGetFlowReqDto.setPsnFirstAccount(reqVo.getBaseInfo().getCheckedPhone());
+        esignGetFlowReqDto.setOrgSecondName(longListMap.get(carrierEntId).getFirmName());
+        esignGetFlowReqDto.setPsnSecondAccount(reqVo.getBaseInfo().getCarrierPhone());
         Map<String, Object> map = BeanUtils.convertToMap(esignGetFlowReqDto);
-        String res = OkHttpUtils.doPostUploadFile("http://10.10.10.149:8840/v1/sign/getFlow", map);
+        String res = OkHttpUtils.doPostUploadFile("http://10.10.10.224:8840/v1/sign/getFlow", map);
+        //todo 解析返参，返参有流程id返回，表需要新加字段来存储
+
     }
 
     public static File getFileByHttpURL(String newUrl, String fileName) {

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

@@ -658,8 +658,4 @@ public class KwcContractTradeService {
         }
     }
 
-}
-
-
-
-
+}