sonar修复

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/controller/OneClickDataController.java

@@ -52,10 +52,12 @@ public class OneClickDataController {
             return Result.buildFail("操作类型必填");
         } else {
              oneClickModelNew=setDefaultValue(oneClickModel);
-            if(oneClickModelNew.getChannel().equals("1")){
+            String defaultChannel="1";
+            if(defaultChannel.equals(oneClickModelNew.getChannel())){
                 return Result.buildFail("暂不支持Channel=1的渠道");
             }
-            if(oneClickModelNew.getFundID().equals("540") || oneClickModelNew.getFundID().equals("610") || oneClickModelNew.getFundID().equals("650") || oneClickModelNew.getFundID().equals("670")){
+             String fundID=oneClickModelNew.getFundID();
+            if(CommonType.PRODUCTID540.equals(fundID) || CommonType.PRODUCTID610.equals(fundID) || CommonType.PRODUCTID650.equals(fundID) || CommonType.PRODUCTID670.equals(fundID)){
                 return Result.buildFail("暂不支持惠金所业务");
             }
             log.info("打印最新的oneClickModelNew={}", oneClickModelNew);

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/model/CommonType.java

@@ -14,7 +14,11 @@ public enum CommonType {
     PRODUCTTYPETHREEN(3,"3"),
     PRODUCTID900(900,"900"),
     PRODUCTID910(910,"910"),
-    PRODUCTID920(920,"920");
+    PRODUCTID920(920,"920"),
+    PRODUCTID540(540,"540"),
+    PRODUCTID610(610,"610"),
+    PRODUCTID650(650,"650"),
+    PRODUCTID670(670,"670");
     private int code;
 
     private String desc;

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/OneClickDataQueueOperateServiceImpl.java

@@ -247,13 +247,14 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
     }
 
     public void   isOkLoan(JSONObject result,OneClickData oneClickData){
-        //这边判断有问题需要改？？？？？？？？？？？？？？
+        //这边判断有问题需要改
         boolean isOk=false;
-      if (result.containsKey("businessCode") && result.containsKey("code")) {
-          if (StringUtils.isNotEmpty(result.get("businessCode").toString().trim()) && StringUtils.isNotEmpty(result.get("code").toString().trim())) {
-
-              String businessCode = result.get("businessCode").toString().trim();
-              String code = result.get("code").toString().trim();
+        String businessCodeKey="businessCode";
+        String codeKey="code";
+      if (result.containsKey(businessCodeKey) && result.containsKey(codeKey)) {
+          String businessCode = result.get("businessCode").toString().trim();
+          String code = result.get("code").toString().trim();
+          if (StringUtils.isNotEmpty(businessCode) && StringUtils.isNotEmpty(code)) {
                isOk=(businessCode.equals(ResposeResultEnum.BUSINESSCODE.getDesc()) && code.equals(ResposeResultEnum.BUSINESSCODE.getDesc())) ;
 
           } else {
@@ -261,18 +262,17 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
 
           }
       }
-
-      if(result.containsKey("statusCode") && result.containsKey("statusCode")) {
-          if (StringUtils.isNotEmpty(result.get("statusCode").toString().trim()) && StringUtils.isNotEmpty(result.get("context").toString().trim())) {
-              String statusCode = result.get("statusCode").toString().trim();
-              String context = result.get("context").toString().trim();
+        String statusCodeKey="statusCode";
+        String contextKey="context";
+      if(result.containsKey(statusCodeKey) && result.containsKey(contextKey)) {
+          String statusCode = result.get("statusCode").toString().trim();
+          String context = result.get("context").toString().trim();
+          if (StringUtils.isNotEmpty(statusCode) && StringUtils.isNotEmpty(context)) {
               isOk = (statusCode.equals(ResposeResultEnum.STATUSCODE.getDesc()) && context.equals(ResposeResultEnum.CONTEXT_SUCCESS.getDesc())) || (statusCode.equals(ResposeResultEnum.STATUSCODE.getDesc()) && context.equals(ResposeResultEnum.CONTEXT_FAIL.getDesc()));
           } else {
               oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.LOAN_REQUEST_NULL.getCode(), oneClickData.getId());
-
           }
       }
-
         if (isOk) {
             log.info("获取当前的isOk={}",isOk);
             // 查看当前的放款单的状态是21
@@ -280,24 +280,20 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
             log.info("放款请求成功后的loanApplicationHistory={}", loanApplicationHistory);
             String progress1=loanApplicationHistory.getProgress().getDescription().trim();
             if (LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().equals(progress1)) {
-
                 //修改打款状态21
                 oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.TO_JRWAITLOAN.getCode(), oneClickData.getId());
             }else if(LoanProgress.CHECK_REPAYMENT_PLAN.getDescription().equals(progress1)){
                 // 提现成功了，收到放款成功消息，修改oneClickData的放款状态
                 oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.CHECK_REPAYMENT_PLAN.getCode(), oneClickData.getId());
-
             } else if(LoanProgress.FINAL_FUNDED_APPROVAL_FAIL.getDescription().equals(progress1)){
                 // 提现成功了，收到放款失败消息，修改oneClickData的放款状态
                 oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.FINAL_FUNDED_APPROVAL_FAIL.getCode(), oneClickData.getId());
-
             }else {
                 log.info("放款请求成功，但是查询库中的状态不对progress1={}",progress1);
                 //直投打款成功，但状态不对
                 oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.DIRECT_INVESTMENT_SUCCESS_STATUSNOTRIGHT.getCode(), oneClickData.getId());
             }
             //放款失败的逻辑需要添加
-
         } else {
             log.info("返回结果不对isOk");
             oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.LOAN_REQUEST_FAILED.getCode(), oneClickData.getId());