Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -371,4 +371,9 @@ public interface BusSalesOrderFeign {
     @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}")
     @ResponseBody
     ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid);
+
+    @ApiOperation("保存销售订单贷款人")
+    @PostMapping("/saveSaleOrderInputLender/{saleOrderSid}/{sid}")
+    @ResponseBody
+    ResultBean<SalesLenderVo> saveSaleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -346,4 +346,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -81,7 +81,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ResponseBody
     ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
-    @ApiOperation("点击贷款人确认时弹出的数量")
+/*    @ApiOperation("点击贷款人确认时弹出的数量")
     @GetMapping("/getOrderNum")
     @ResponseBody
     ResultBean<OrderNumVo> getOrderNum(@RequestParam("sid") String sid);
@@ -89,7 +89,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ApiOperation("确认数量")
     @PostMapping("/confirmBorrow")
     @ResponseBody
-    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);
+    ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query);*/
 
     @ApiOperation("公司非担保业务进度维护")
     @PostMapping("/noGuaranteeCreditReviewPage")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java

@@ -75,7 +75,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 		return null;
 	}
 
-	@Override
+/*	@Override
 	public ResultBean<OrderNumVo> getOrderNum(String sid) {
 		return null;
 	}
@@ -83,7 +83,7 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
 	@Override
 	public ResultBean confirmBorrow(OrderBorrowQuery query) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {

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

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -220,4 +221,5 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     BusSalesOrder selectByContractNos(String contractNo);
 
     String selectBySid(String sid);
+
 }

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

@@ -57,7 +57,6 @@
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
         if(bo.nodeState = '已办结', true, false) as showStopBtn,
-        if(bo.nodeState = '已办结', true, false) as showBorrowBtn,
         bo.nodeState is null as showUpdateBtn,
         bo.nodeState is null as showDeleteBtn,
         0 as showFinancialBtn,

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

@@ -429,4 +429,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return busSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
     }
+
+    @Override
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        return busSalesOrderService.saveSaleOrderInputLender(saleOrderSid,sid);
+    }
 }

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

@@ -160,6 +160,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
@@ -2104,15 +2107,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setShowContractBtn(false);
             }
             //ToDo:需考虑家访准备是否存在该贷款人，若存在，则不允许修改贷款人，即确定贷款人按钮不显示。
-            if (record.isShowBorrowBtn()) {
+            if ("已办结".equals(record.getSaleOrderState()) && "2".equals(record.getCarPurchaseKey())) {
-                //为现车类型且不确定车架号的，
+                /*//为现车类型且不确定车架号的，
                 if ("1".equals(record.getType())) {
                     if (StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && !"0".equals(record.getNowCarUnknownVinNum())) {
                         record.setShowBorrowBtn(true);
                     } else {
                         record.setShowBorrowBtn(false);
                     }
-                }
+                }else{
+
+                }*/
+                record.setShowBorrowBtn(true);
             }
 
 
@@ -7431,6 +7437,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         busSalesOrderBorrower.setVehCount(Integer.parseInt(num));
+        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(sid);
+        list.removeAll(Collections.singleton(null));
+        for (int i = 0; i < Integer.parseInt(num); i++) {
+            BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
+            busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
+            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+        }
         busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
         return rb.success();
     }
@@ -7451,4 +7464,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
         return rb.success();
     }
+
+    public ResultBean<SalesLenderVo> saveSaleOrderInputLender(String saleOrderSid, String sid) {
+        ResultBean resultBean = busSalesOrderBorrowerService.confirmBorrow(saleOrderSid, sid);
+        ResultBean<SalesLenderVo> lenderVoResultBean = saleOrderInputLender(saleOrderSid);
+        return lenderVoResultBean;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -91,4 +92,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     int selectByNum(String salesOrderSid);
 
     BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
+
+    LoanPreloanCreditApply selectByCr(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -75,4 +75,8 @@
             bus_sales_order bo on bo.sid = bb.salesOrderSid
         where bo.customerSid = bb.customSid and bo.sid = #{saleOrderSid}
     </select>
+
+    <select id="selectByCr" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
+        select * from anrui_riskcenter.loan_preloan_credit_apply where sid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -98,7 +98,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
         return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid);
     }
 
-    @Override
+  /*  @Override
     public ResultBean<OrderNumVo> getOrderNum(String sid) {
         return busSalesOrderBorrowerService.getOrderNum(sid);
     }
@@ -106,7 +106,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     @Override
     public ResultBean confirmBorrow(OrderBorrowQuery query) {
         return busSalesOrderBorrowerService.confirmBorrow(query);
-    }
+    }*/
 
     @Override
     public ResultBean<PagerVo<BusNoGuaranteeCreditReviewVo>> noGuaranteeCreditReviewPage(PagerQuery<BusNoGuaranteeCreditReviewQuery> pq) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -37,10 +37,12 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -132,7 +134,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
-    public ResultBean<OrderNumVo> getOrderNum(String sid) {
+  /*  public ResultBean<OrderNumVo> getOrderNum(String sid) {
         ResultBean<OrderNumVo> rb = ResultBean.fireFail();
         OrderNumVo orderNumVo = new OrderNumVo();
         BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
@@ -145,40 +147,28 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         int yuNum = busSalesOrderPrice.getQuantity() - num;
         orderNumVo.setOrderYuNum(String.valueOf(yuNum));
         return rb.success().setData(orderNumVo);
-    }
+    }*/
 
-    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+//    public ResultBean confirmBorrow(OrderBorrowQuery query) {
+    public ResultBean confirmBorrow(String saleOrderSid,String sid) {
         ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.selectByCr(sid);
         //销售订单sid
-        String sid = query.getSid();
+        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(saleOrderSid, loanPreloanCreditApply.getCustSid());
-        String customerSid = query.getCustomSid();
-        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(sid, customerSid);
         if (busSalesOrderBorrower != null) {
             return rb.setMsg("该销售订单中已存在该贷款人");
         }
         busSalesOrderBorrower = new BusSalesOrderBorrower();
         busSalesOrderBorrower.setSalesOrderSid(sid);
-        busSalesOrderBorrower.setBorrowerName(query.getBorrowerName());
+        busSalesOrderBorrower.setBorrowerName(loanPreloanCreditApply.getCustName());
-        busSalesOrderBorrower.setCustomSid(query.getCustomSid());
+        busSalesOrderBorrower.setCustomSid(loanPreloanCreditApply.getCustSid());
-        busSalesOrderBorrower.setMobile(query.getMobile());
+        busSalesOrderBorrower.setMobile(loanPreloanCreditApply.getPhone());
-        busSalesOrderBorrower.setVehCount(query.getVehCount());
         LoanFinPolicy loanFinPolicy = baseMapper.selectBySid(sid);
         if (loanFinPolicy != null) {
             busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
             busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
             busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
         }
-        //更新销售订单车辆里的贷款人
-        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(sid);
-        list.removeAll(Collections.singleton(null));
-        if (list.size() < query.getVehCount()) {
-            return rb.setMsg("销售订单剩余台数不足");
-        }
-        for (int i = 0; i < query.getVehCount(); i++) {
-            BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
-            busSalesOrderVehicle.setBorrowerSid(query.getCustomSid());
-            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-        }
         baseMapper.insert(busSalesOrderBorrower);
         return rb.success();
     }

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -22,7 +22,7 @@
           <el-col :span="18">
             <div class="span-sty">产品政策</div>
             <el-form-item>
-              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" filterable clearable class="addinputInfo">
+              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" style="width: 60%" filterable clearable class="addinputInfo">
                 <el-option v-for="item in policy_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -311,6 +311,12 @@ import { calculate } from '@/api/salesManagement/orderManagement'
 
 export default {
   name: 'JinRongFangAn',
+  props: {
+    modelSid: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       viewTitle: '',
@@ -422,7 +428,7 @@ export default {
       this.finance = JSON.parse(JSON.stringify(value))
       this.isShowMore = this.finance.isShowMore
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -508,7 +514,7 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       }
-      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -625,10 +631,10 @@ export default {
         // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
         if (this.finance.serviceChargeTypeKey === '01') {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '02') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '03') {
           // 等于金融产品政策中服务费
           this.finance.serviceAmount = this.finance.serviceChargeTypeValue

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -308,7 +308,7 @@
         </div>
       </el-form>
     </div>
-    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+    <financialscheme v-bind="$attrs" v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 <script>

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue

@@ -106,7 +106,7 @@
               </el-col>
             </el-row>
             <div v-show="formobj.financePlan !== '1' && formobj.typeKey === '1'">
-              <financialschemeEdit ref="divJR" @backParameters="backJR"/>
+              <financialschemeEdit :modelSid="formobj.modelSid" ref="divJR" @backParameters="backJR"/>
             </div>
           </div>
         </el-form>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -22,7 +22,7 @@
           <el-col :span="18">
             <div class="span-sty">产品政策</div>
             <el-form-item>
-              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" filterable clearable class="addinputInfo">
+              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" style="width: 60%" filterable clearable class="addinputInfo">
                 <el-option v-for="item in policy_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -389,6 +389,7 @@ export default {
         vehTotalPrice: ''
       },
       orgPath: '',
+      modelSid: '',
       rules: {}
     }
   },
@@ -416,12 +417,13 @@ export default {
       }
       return val
     },
-    showAdd(value, orgSidPath) {
+    showAdd(value, orgSidPath, modelSid) {
       this.init()
+      this.modelSid = modelSid
       this.finance = JSON.parse(JSON.stringify(value))
       this.orgPath = orgSidPath
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -508,7 +510,7 @@ export default {
         vehTotalPrice: ''
       }
       console.log(this.orgPath, window.sessionStorage.getItem('userSid'), this.finance.isPack, 88888)
-      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -622,10 +624,10 @@ export default {
         // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
         if (this.finance.serviceChargeTypeKey === '01') {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '02') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '03') {
           // 等于金融产品政策中服务费
           this.finance.serviceAmount = this.finance.serviceChargeTypeValue
@@ -845,6 +847,7 @@ export default {
         vehTotalPrice: ''
       }
       this.orgPath = ''
+      this.modelSid = ''
       this.$emit('doback')
     }
   }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue

@@ -395,22 +395,24 @@ export default {
         vehTotalPrice: ''
       },
       orgSidPath: '',
+      modelSid: '',
       rules: {}
     }
   },
   methods: {
-    showInfo(value, orgSidPath) {
+    showInfo(value, orgSidPath, modelSid) {
       selectDetailss({ businessSid: value }).then((res) => {
         if (res.success) {
           this.formobj = res.data
           this.formobj.saleOrderSid = res.data.salesOrderSid
+          this.modelSid = modelSid
         }
       })
       this.orgSidPath = orgSidPath
     },
     financialComputing() {
       this.viewState = 2
-      this.$refs['divCount'].showAdd(this.formobj, this.orgSidPath)
+      this.$refs['divCount'].showAdd(this.formobj, this.orgSidPath, this.modelSid)
     },
     backData(value) {
       this.viewState = 1

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@@ -465,7 +465,7 @@ export default {
     },
     handleLook() {
       this.viewState = 2
-      this.$refs['divAdd'].showInfo(this.linkByParameter.businessSid, this.formobj.orgSidPath)
+      this.$refs['divAdd'].showInfo(this.linkByParameter.businessSid, this.formobj.orgSidPath, this.formobj.busSalesOrderModel.modelSid)
     },
     // 合计
     getSummaries(param) {

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java

@@ -165,4 +165,6 @@ public class AppCrmSolutions {
 
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
+
+    private String modelSid;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandDetailsVo.java

@@ -54,4 +54,5 @@ public class AppCrmVehicledemandDetailsVo implements Vo {
     private AppCrmSolutions finNormal;
 
 
+
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -371,7 +371,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     List<CrmSolutionListVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CrmSolutionListVo.class)).collect(Collectors.toList());
                     finNormal.setFinanceForms(voList);
                 }
+                finNormal.setModelSid(appCrmVehicledemandDetailsVo.getModelSid());
                 appCrmVehicledemandDetailsVo.setFinNormal(finNormal);
+
             }
         }
         return rb.success().setData(appCrmVehicledemandDetailsVo);

anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@@ -273,6 +273,12 @@ import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions
 
 export default {
   name: 'JinRongFangAn',
+  props: {
+    modelSid: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       viewTitle: '',
@@ -350,7 +356,6 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       },
-      vehModelSid: '',
       rules: {
       }
     }
@@ -379,12 +384,11 @@ export default {
       }
       return val
     },
-    showAdd(value, vehModelSid) {
+    showAdd(value) {
       this.init()
-      this.vehModelSid = vehModelSid
       this.finance = JSON.parse(JSON.stringify(value))
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: vehModelSid }).then((resp) => {
+        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -470,7 +474,7 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       }
-      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => {
+      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -809,7 +813,6 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       }
-      this.vehModelSid = ''
       this.$emit('doback')
     }
   }

anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -271,7 +271,7 @@
         </div>
       </el-form>
     </div>
-    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+    <financialscheme v-show="viewState == 2" v-bind="$attrs" ref="divCount" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 <script>
@@ -356,18 +356,16 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       },
-      vehModelSid: '',
       rules: {}
     }
   },
   methods: {
-    showInfo(value, vehModelSid) {
+    showInfo(value) {
       this.formobj = JSON.parse(JSON.stringify(value))
-      this.vehModelSid = vehModelSid
     },
     financialComputing() {
       this.viewState = 2
-      this.$refs['divCount'].showAdd(this.formobj, this.vehModelSid)
+      this.$refs['divCount'].showAdd(this.formobj)
     },
     backData(value) {
       this.viewState = 1
@@ -375,7 +373,6 @@ export default {
     },
     backParameters() {
       this.$emit('backParameters', this.formobj)
-      this.vehModelSid = ''
       this.formobj = {
         accessoriesAmount: '',
         accessoriesAmountCb: false,

anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue

@@ -172,7 +172,7 @@
               </el-col>
             </el-row>
           </div>
-          <financialschemeEdit ref="divJRFA" @backParameters="backData"/>
+          <financialschemeEdit :modelSid="formobj.vehModelSid" ref="divJRFA" @backParameters="backData"/>
         </el-form>
       </div>
     </div>
@@ -367,7 +367,7 @@ export default {
       })
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.vehModelSid)
+      this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
     },
     showEdit(row) {
       this.init()
@@ -379,7 +379,7 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
-          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.vehModelSid)
+          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
           if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) {
             this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => {
               this.image_list.push({

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue

@@ -171,7 +171,7 @@
               </el-col>
             </el-row>
           </div>
-          <financialschemeEdit ref="divJRFA" @backParameters="backData"/>
+          <financialschemeEdit :modelSid="formobj.vehModelSid" ref="divJRFA" @backParameters="backData"/>
         </el-form>
       </div>
     </div>
@@ -380,7 +380,7 @@ export default {
         if (res.success) {
           this.formobj = res.data
           this.formobj.instanceId = res.data.procInstId
-          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.orgPath, this.formobj.vehModelSid)
+          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.orgPath)
           if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) {
             this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => {
               this.image_list.push({

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@@ -273,6 +273,12 @@ import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions
 
 export default {
   name: 'JinRongFangAn',
+  props: {
+    modelSid: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       viewTitle: '',
@@ -351,7 +357,6 @@ export default {
         vehTotalPrice: ''
       },
       orgPath: '',
-      vehModelSid: '',
       rules: {
       }
     }
@@ -380,13 +385,12 @@ export default {
       }
       return val
     },
-    showAdd(value, orgPath, vehModelSid) {
+    showAdd(value, orgPath) {
       this.init()
       this.finance = JSON.parse(JSON.stringify(value))
       this.orgPath = orgPath
-      this.vehModelSid = vehModelSid
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => {
+        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -472,7 +476,7 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       }
-      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.vehModelSid }).then((resp) => {
+      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue

@@ -271,7 +271,7 @@
         </div>
       </el-form>
     </div>
-    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+    <financialscheme v-bind="$attrs" v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 <script>
@@ -357,19 +357,17 @@ export default {
         vehTotalPrice: ''
       },
       orgPath: '',
-      vehModelSid: '',
       rules: {}
     }
   },
   methods: {
-    showInfo(value, orgPath, vehModelSid) {
+    showInfo(value, orgPath) {
       this.formobj = JSON.parse(JSON.stringify(value))
       this.orgPath = orgPath
-      this.vehModelSid = vehModelSid
     },
     financialComputing() {
       this.viewState = 2
-      this.$refs['divCount'].showAdd(this.formobj, this.orgPath, this.vehModelSid)
+      this.$refs['divCount'].showAdd(this.formobj, this.orgPath)
     },
     backData(value) {
       this.viewState = 1
@@ -377,7 +375,6 @@ export default {
     },
     backParameters() {
       this.$emit('backParameters', this.formobj)
-      this.vehModelSid = ''
       this.formobj = {
         accessoriesAmount: '',
         accessoriesAmountCb: false,

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java

@@ -30,5 +30,7 @@ public class LoanPreloanVo implements Vo {
     @ApiModelProperty("申请日期")
     private String createTime;
 
+    private String sid;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java

@@ -110,4 +110,6 @@ public class SolutionssQuery implements Query {
     private String offsetPurchasetax;
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
+
+    private String modelSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java

@@ -170,5 +170,7 @@ public class SolutionssVo implements Vo {
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
 
+    private String modelSid;
+
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -55,6 +55,7 @@
                   , #{name}
                   , '%')
             </if>
+            and lfp.validDateTo > now()
         </where>
         order by lfp.id desc
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -591,7 +591,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         QueryWrapper<LoanFinPolicy> qw = new QueryWrapper<>();
         if (query != null) {
             //========================================数据授权开始
-            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+           /* PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getUserSid());
@@ -626,6 +626,12 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             } else {
                 PagerVo<AppLoanFinPolicyVo> p = new PagerVo<>();
                 return p;
+            }*/
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("lfp.useOrgSid", useOrgSid);
+                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size());
+                qw.like("lfp.useDeptSids", deptSid);
             }
             qw.eq("lfp.filingState", 1);
             qw.eq("lfp.useSate", 0);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -25,7 +25,8 @@
         select distinct(la.idCard),la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
         la.capitalName,
-        lp.peoName
+        lp.peoName,
+        la.sid
         from loan_preloan_credit_apply la
         left join loan_preloan_credit_peo lp on la.sid = lp.mainSid
         <where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuery;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
@@ -43,6 +44,7 @@ import com.yxt.anrui.riskcenter.biz.loancreditappealapply.LoanCreditAppealApplyS
 import com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoService;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -70,6 +72,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
     private LoanPreloanCreditPeoService loanPreloanCreditPeoService;
     @Autowired
     private LoanCreditAppealApplyService loanCreditAppealApplyService;
+    @Autowired
+    private LoanSolutionsService loanSolutionsService;
 
     public PagerVo<LoanPreloanCreditApplyVo> listPageVo(PagerQuery<LoanPreloanCreditApplyQuery> pq) {
         LoanPreloanCreditApplyQuery query = pq.getParams();
@@ -579,6 +583,13 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
 
     public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
         ResultBean<LoanOrderPreloanVo> rb = ResultBean.fireFail();
+        //自营非担保业务不用对实际购车人进行信用审核，只需要对贷款人进行资方信用审核。
+        LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(sid);
+        if(loanSolutions != null){
+            if("01".equals(loanSolutions.getTypeKey())){
+                return rb.success();
+            }
+        }
         //查询销售订单的实际购车人也就是客户是否已信用审核通过
         LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
         LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid);

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

@@ -7,6 +7,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
@@ -1656,6 +1657,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BusSalesOrdersVo busSalesOrdersVo = resultBean.getData();
             solutionssVo.setSzPrice(busSalesOrdersVo.getSzPrice());
             solutionssVo.setFinalPrice(busSalesOrdersVo.getFinalPrice());
+            BusSalesOrderModel busSalesOrderModel = busSalesOrdersVo.getBusSalesOrderModel();
+            solutionssVo.setModelSid(busSalesOrderModel.getModelSid());
             if (busSalesOrdersVo.getBusSalesOrder() != null) {
                 BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder();
                 //全款且为三方金融

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -1007,8 +1007,13 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
         AppLoanTemplateQuery query = pagerQuery.getParams();
         QueryWrapper<LoanTemplate> qw = new QueryWrapper<>();
         if (query != null) {
-            qw.eq("lfp.orgSidPath", query.getOrgPath());
+            if(StringUtils.isNotBlank(query.getOrgPath())){
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("lfp.useOrgSid",useOrgSid);
+            }
+//            qw.eq("lfp.orgSidPath", query.getOrgPath());
             qw.eq("lfp.nodeState", "已办结");
+            qw.eq("lfp.useState",0);
         }
         IPage<LoanTemplate> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppLoanTemplateVo> pagging = baseMapper.getCustomizedList(page, qw, query.getName());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -328,7 +328,7 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("初始化录入贷款人列表")
     @GetMapping("/init/saleOrderInputLender/{saleOrderSid}")
     @ResponseBody
-    ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
+    ResultBean<InputLenderVo> initSaleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
 
     @ApiOperation("删除销售订单贷款人")
     @DeleteMapping("/delete/saleOrderInputLender/{sid}")
@@ -345,4 +345,9 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid);
 
+    @ApiOperation("保存销售订单贷款人")
+    @PostMapping("/save/saleOrderInputLender/{saleOrderSid}/{sid}")
+    @ResponseBody
+    ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid")String saleOrderSid,@PathVariable("sid")String sid);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -292,7 +292,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
         return null;
     }
 
@@ -310,4 +310,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java

@@ -204,5 +204,7 @@ public class AppSolutionVo {
     private String serviceChargeTypeKey;
     private String serviceChargeTypeValue;
 
+    private String modelSid;
+
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -385,8 +385,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
-        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid);
+        return appBusSalesOrderService.initSaleOrderInputLender(saleOrderSid);
     }
 
     @Override
@@ -404,4 +404,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid,sid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -753,7 +753,7 @@ public class AppBusSalesOrderService {
         return rb.success().setData(vinNoVo);
     }
 
-    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String saleOrderSid) {
         ResultBean<InputLenderVo> rb = ResultBean.fireFail();
         InputLenderVo inputLenderVo = new InputLenderVo();
         ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saleOrderInputLender(saleOrderSid);
@@ -773,4 +773,13 @@ public class AppBusSalesOrderService {
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
         return busSalesOrderFeign.saleOrderInputLenderOwn(saleOrderSid);
     }
+
+    public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid, String sid) {
+        ResultBean<InputLenderVo> rb = ResultBean.fireFail();
+        InputLenderVo inputLenderVo = new InputLenderVo();
+        ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid,sid);
+        SalesLenderVo vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, inputLenderVo);
+        return rb.success().setData(inputLenderVo);
+    }
 }