提交代码

service/src/main/java/com/hfkj/channel/saas/SaasMerService.java

@@ -370,7 +370,7 @@ public class SaasMerService {
         if (platformNo == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户未提交过进件");
         }
-        JSONObject responseObj = reconsiderSubmit(platformNo.getPlatformNo());
+        String responseObj = reconsiderSubmit(platformNo.getPlatformNo());
 
         String orderNo = System.currentTimeMillis()+"";
         // 增加进件记录
@@ -378,7 +378,7 @@ public class SaasMerService {
         record.setMerId(merId);
         record.setPlatformType(PlatformTypeEnum.type1.getNumber());
         record.setOrderNo(orderNo);
-        record.setContractId(responseObj.toJSONString());
+        record.setContractId(responseObj);
         record.setStatus(1);
         merContractRecordService.insertRecord(record);
 
@@ -389,16 +389,16 @@ public class SaasMerService {
         recordMsg.setRequestContent(platformNo.getPlatformNo());
         recordMsg.setResponseCode(null);
         recordMsg.setResponseMsg(null);
-        recordMsg.setResponseContent(responseObj.toJSONString());
+        recordMsg.setResponseContent(responseObj);
         merContractRecordMsgService.insertRecordMsg(recordMsg);
-        return responseObj;
+        return new JSONObject();
     }
 
     /**
      * 进件复议提交
      * @return
      */
-    public JSONObject reconsiderSubmit(String customerNo) throws Exception {
+    public String reconsiderSubmit(String customerNo) throws Exception {
         Map<String,Object> param = new HashMap<>();
         param.put("customerNo", customerNo);
 
@@ -415,7 +415,7 @@ public class SaasMerService {
         if (responseObj == null || !responseObj.getString("code").equals("000000")) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
         }
-        return JSONObject.parseObject(new String(RSAUtil.decryptByPublicKey(Base64.decodeBase64(responseObj.getString("data")), Base64.decodeBase64(RSAUtil.PUBLIC_KEY))));
+        return new String(RSAUtil.decryptByPublicKey(Base64.decodeBase64(responseObj.getString("data")), Base64.decodeBase64(RSAUtil.PUBLIC_KEY)));
 
     }
 

service/src/main/java/com/hfkj/service/impl/BsMerContractServiceImpl.java

@@ -8,6 +8,7 @@ import com.hfkj.common.exception.SysCode;
 import com.hfkj.entity.*;
 import com.hfkj.channel.lakala.LaKaLaMerService;
 import com.hfkj.service.*;
+import com.hfkj.sysenum.MerCompleteStatusEnum;
 import com.hfkj.sysenum.PlatformTypeEnum;
 import org.springframework.stereotype.Service;
 
@@ -61,10 +62,6 @@ public class BsMerContractServiceImpl implements BsMerContractService {
         if (mer == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户");
         }
-        if (mer.getCompleteStatus() != 1){
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户资料未完善");
-        }
-
         // 当前的进件平台
         BsPlatform platform = platformService.getCurrentPlatform();
         if (platform.getPlatformType().equals(PlatformTypeEnum.type1.getNumber())) {