Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3550,15 +3550,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
-            StringBuilder typeValue = new StringBuilder();
-            if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
-                typeValue = typeValue.append("销售类型：" + solutionsDetailsVo.getType());
-            } else {
-                typeValue = typeValue.append("销售类型：" + appOrderDetailsVo.getPayType());
-            }
-            list.add(getValueSpanSize(typeValue.toString(), 1, 0, false));
-
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey()) && "02".equals(solutionsDetailsVo.getTypeKey())) {
+                StringBuilder typeValue = new StringBuilder();
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                    typeValue = typeValue.append("销售类型：" + solutionsDetailsVo.getType());
+                } else {
+                    typeValue = typeValue.append("销售类型：" + appOrderDetailsVo.getPayType());
+                }
+                list.add(getValueSpanSize(typeValue.toString(), 2, 0, false));
+                //资方及产品政策
+                StringBuilder polivyNameValue = new StringBuilder();
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicyName())) {
+                    polivyNameValue = polivyNameValue.append("资方及产品政策：").append(solutionsDetailsVo.getPolicyName());
+                } else {
+                    polivyNameValue = polivyNameValue.append("资方及产品政策：").append("-");
+                }
+                list.add(getValueSpanSize(polivyNameValue.toString(), 2, 0, false));
                 list.add(getValueSpanSize("融资项目", 2, 1, true));
                 //厂家贴息
                 StringBuilder factoryDiscountValue = new StringBuilder();
@@ -3586,6 +3593,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 list.add(getValueSpanSize(serviceAmountValue.toString(), 2, 0, false));
             } else {
+                StringBuilder typeValue = new StringBuilder();
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                    typeValue = typeValue.append("销售类型：" + solutionsDetailsVo.getType());
+                } else {
+                    typeValue = typeValue.append("销售类型：" + appOrderDetailsVo.getPayType());
+                }
+                list.add(getValueSpanSize(typeValue.toString(), 1, 0, false));
                 //是否打包
                 StringBuilder isPackValue = new StringBuilder();
                 if (StringUtils.isNotBlank(solutionsDetailsVo.getIsPack())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -618,6 +618,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 loanSolutions.setType(dto.getType());
                 loanSolutions.setTypeKey(dto.getTypeKey());
             }
+            //产品政策名称
+            String policyName = dto.getPolicyName();
+            if (StringUtils.isNotBlank(policyName)) {
+                loanSolutions.setPolicyName(policyName);
+            }
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
                 loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             } else {

anrui-scm/anrui-scm-ui/src/utils/request.js

@@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 30000 // request timeout
+  timeout: 60000 // request timeout
 })
 
 // request interceptor