bugfix

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

@@ -243,17 +243,7 @@ public class KwcContractTradeService {
         long contactId = new IdWorker(1L).nextId();
         kwcContractTrade.setId(contactId);
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
-        String contractFile = reqVo.getContractFile();
-        if (StringUtils.isNotBlank(contractFile)) {
-            JSONArray jsonArray = JSONArray.parseArray(contractFile);
-            for (int n = 0; n < jsonArray.size(); n++) {
-                JSONObject jsonObject = jsonArray.getJSONObject(n);
-                String url = jsonObject.getString("url");
-                jsonObject.put("url", FileUtils.replaceAll(url));
-            }
-            kwcContractTrade.setSigningUrl(JSON.toJSONString(jsonArray));
-        }
-
+        kwcContractTrade.setSigningUrl(changeFile(reqVo.getContractFile()));
         if (kwcContractTradeMapper.insert(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -266,6 +256,19 @@ public class KwcContractTradeService {
         return contactId;
     }
 
+    private String changeFile(String contractFile) {
+        if (StringUtils.isNotBlank(contractFile)) {
+            JSONArray jsonArray = JSONArray.parseArray(contractFile);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.replaceAll(url));
+            }
+            return JSON.toJSONString(jsonArray);
+        }
+        return null;
+    }
+
 
     private void checkParam(TradeBaseInfoReqVo baseInfo, List<TradeGoodsInfoReqVo> goodsInfo) {
         if (Objects.nonNull(baseInfo)) {
@@ -629,7 +632,6 @@ public class KwcContractTradeService {
         if (Objects.isNull(kwcContractTrade)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
-        KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
 
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         kwcContractTrade.setEntId(LoginUserHolder.getEntId());
@@ -656,7 +658,7 @@ public class KwcContractTradeService {
             }
         }
         kwcContractTrade.setAmount(amountTotal);
-        kwcContractTrade.setSigningUrl(reqVo.getContractFile());
+        kwcContractTrade.setSigningUrl(changeFile(reqVo.getContractFile()));
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
         kwcContractTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwcContractTrade.setUpdateTime(date);