From 890ecad1f074263ce9ef7fb0c8c7c20f983ce2da Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 1 Nov 2023 15:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=B4=B7=E5=89=8D=E4=BF=A1=E7=94=A8=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=9D=A5=E8=BD=A6=E5=9E=8B=E5=92=8C=E8=B5=84?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/base/common/CommonService.java        | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java
index 0ea3cc72d4..df847b101d 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java
@@ -16,6 +16,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.terminal.api.base.common.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -205,33 +206,37 @@ public class CommonService {
 
     public ResultBean<CarModelVo> getInsertPreloan(String customerTypeKey, String customerTypeValue,String orderSid) {
         ResultBean<CarModelVo> rb = ResultBean.fireFail();
-        String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
-        String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity";
-        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
-        AppSubVersionVo appSubVersionVo = voResultBean.getData();
         CarModelVo carModelVo = new CarModelVo();
-        Map<String, Object> map = new HashMap<>();
-        map.put("creditType", 0);
-        map.put("createSource", 0);
-        map.put("customerTypeKey", customerTypeKey);
-        map.put("customerTypeValue", customerTypeValue);
-        appSubVersionVo.setJson(JSONObject.toJSONString(map));
-        BeanUtil.copyProperties(appSubVersionVo, carModelVo);
-        carModelVo.setRequestCode("1004");
-        carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager");
-        carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY");
-        List<String> aRouterParamType = new ArrayList<>();
-        aRouterParamType.add("INT");
-        aRouterParamType.add("INT");
-        aRouterParamType.add("STRING");
-        aRouterParamType.add("STRING");
-        List<String> aRouterParamValue = new ArrayList<>();
-        aRouterParamValue.add("0");
-        aRouterParamValue.add("0");
-        aRouterParamValue.add(customerTypeKey);
-        aRouterParamValue.add(customerTypeValue);
-        carModelVo.setARouterParamType(aRouterParamType);
-        carModelVo.setARouterParamValue(aRouterParamValue);
+        if (StringUtils.isNotBlank(orderSid)){
+            carModelVo = getInsertPreloan2(customerTypeKey, customerTypeValue).getData();
+        }else {
+            String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
+            String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity";
+            ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
+            AppSubVersionVo appSubVersionVo = voResultBean.getData();
+            Map<String, Object> map = new HashMap<>();
+            map.put("creditType", 0);
+            map.put("createSource", 0);
+            map.put("customerTypeKey", customerTypeKey);
+            map.put("customerTypeValue", customerTypeValue);
+            appSubVersionVo.setJson(JSONObject.toJSONString(map));
+            BeanUtil.copyProperties(appSubVersionVo, carModelVo);
+            carModelVo.setRequestCode("1004");
+            carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager");
+            carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY");
+            List<String> aRouterParamType = new ArrayList<>();
+            aRouterParamType.add("INT");
+            aRouterParamType.add("INT");
+            aRouterParamType.add("STRING");
+            aRouterParamType.add("STRING");
+            List<String> aRouterParamValue = new ArrayList<>();
+            aRouterParamValue.add("0");
+            aRouterParamValue.add("0");
+            aRouterParamValue.add(customerTypeKey);
+            aRouterParamValue.add(customerTypeValue);
+            carModelVo.setARouterParamType(aRouterParamType);
+            carModelVo.setARouterParamValue(aRouterParamValue);
+        }
         return rb.success().setData(carModelVo);
     }