Merge remote-tracking branch 'origin/master'

src/main/java/com/jqtx/windows/command/CreditSubmitCommand.java

@@ -67,7 +67,7 @@ public class CreditSubmitCommand extends AbstractCommand {
         String requestBody = RuntimeContextHolder.currentRuntimeContext().getRequestBody();
         CreditSubmitRequest request = JSON.parseObject(requestBody, CreditSubmitRequest.class);
         JSONObject thirdDataReq=new JSONObject();
-        thirdDataReq.put("orderNO",request.getOrderNo());
+        thirdDataReq.put("orderNo",request.getOrderNo());
         windowsProducer.pullCreditThirdData(thirdDataReq);
         CreditModel order = creditComponent.getByOrderNo(request.getOrderNo());
         if (ObjectUtil.isNotNull(order)) {

src/main/java/com/jqtx/windows/command/RiskQueryDataCommand.java

 package com.jqtx.windows.command;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.jqtx.infrastructure.oss.starter.config.OssUtils;
 import com.jqtx.windows.common.factory.AbstractCommand;
+import com.jqtx.windows.common.factory.RuntimeContextHolder;
+import com.jqtx.windows.component.CreditComponent;
+import com.jqtx.windows.component.model.CreditModel;
+import com.jqtx.windows.web.request.RiskCreditRequest;
 import com.jqtx.windows.web.response.JsonResult;
+import com.jqtx.windows.web.response.LoanSubmitResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class RiskQueryDataCommand extends AbstractCommand {
-    @Override
+    @Autowired
+
+    private CreditComponent creditComponent;
+    @Autowired
+    private OssUtils ossUtils;
+
     public JsonResult execute() {
-        return null;
+        String request = RuntimeContextHolder.currentRuntimeContext().getRequestBody();
+        RiskCreditRequest riskCreditRequest = JSON.parseObject(request, RiskCreditRequest.class);
+        CreditModel creditModel = creditComponent.getByOrderNo(riskCreditRequest.getOrderNo());
+        String data = ossUtils.getStringObject(creditModel.getCreditThirdUrl());
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        return JsonResult.success(jsonObject.getJSONObject(riskCreditRequest.getApiCode()));
     }
 }

src/main/java/com/jqtx/windows/common/mq/CreditThirdDataListener.java

@@ -43,14 +43,17 @@ public class CreditThirdDataListener extends AbstractMQConsumerHandler<JSONObjec
 
     @Override
     public void run(JSONObject req) throws Exception {
-        log.info("req:[{}]",req.toJSONString());
-        JSONObject thirdCredit = new JSONObject();
-        thirdCredit.put("reqNo", req.getString("orderNo"));
-        thirdCredit.put("type", "01");
-        abcHttpClient.postRequest(thirdCredit.toJSONString(), ZNPostUrlEnum.CREDIT_APPLY.getCode());
-        CreditModel creditModel1=new CreditModel();
-        creditModel1.setCreditThirdStatus("INIT");
-        creditComponent.updateByOrderNo(req.getString("orderNo"),creditModel1);
+        CreditModel creditModel= creditComponent.getByOrderNo(req.getString("orderNo"));
+        if(creditModel!=null&& creditModel.getCreditThirdStatus()!="INIT"){
+            log.info("req:[{}]",req.toJSONString());
+            JSONObject thirdCredit = new JSONObject();
+            thirdCredit.put("reqNo", req.getString("orderNo"));
+            thirdCredit.put("type", "01");
+            abcHttpClient.postRequest(thirdCredit.toJSONString(), ZNPostUrlEnum.CREDIT_APPLY.getCode());
+            CreditModel creditModel1=new CreditModel();
+            creditModel1.setCreditThirdStatus("INIT");
+            creditComponent.updateByOrderNo(req.getString("orderNo"),creditModel1);
+        }
     }
 }
 

src/main/java/com/jqtx/windows/web/request/RiskCreditRequest.java

+package com.jqtx.windows.web.request;
+
+import lombok.Data;
+
+@Data
+public class RiskCreditRequest {
+    private String orderNo;
+    private String clientName;
+    private String certNo;
+    private String clientCell;
+    private String apiCode;
+
+}