优化

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-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/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;
@@ -7434,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();
     }
@@ -7454,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/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;
@@ -145,43 +147,31 @@ 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();
-        String customerSid = query.getCustomSid();
-        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(sid, customerSid);
+        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(saleOrderSid, loanPreloanCreditApply.getCustSid());
         if (busSalesOrderBorrower != null) {
             return rb.setMsg("该销售订单中已存在该贷款人");
         }
         busSalesOrderBorrower = new BusSalesOrderBorrower();
         busSalesOrderBorrower.setSalesOrderSid(sid);
-        busSalesOrderBorrower.setBorrowerName(query.getBorrowerName());
-        busSalesOrderBorrower.setCustomSid(query.getCustomSid());
-        busSalesOrderBorrower.setMobile(query.getMobile());
-        busSalesOrderBorrower.setVehCount(query.getVehCount());
+        busSalesOrderBorrower.setBorrowerName(loanPreloanCreditApply.getCustName());
+        busSalesOrderBorrower.setCustomSid(loanPreloanCreditApply.getCustSid());
+        busSalesOrderBorrower.setMobile(loanPreloanCreditApply.getPhone());
         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-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-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) {
-        return appBusSalesOrderService.saleOrderInputLender(saleOrderSid);
+    public ResultBean<InputLenderVo> initSaleOrderInputLender(String 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);
+    }
 }