优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busdelivered.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -115,4 +116,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     LoanHomevisitInvestigate selectByBorrowSidAndOrder(@Param("borrowerSid") String borrowerSid, @Param("salesOrderSid") String salesOrderSid);
 
     LoanHomevisitInvestigateOtherpeo selectVisitSid(String sid);
+
+    LoanHomevisitInvestigateCustomer selectCustomer(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -639,4 +639,9 @@
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate">
         select * from anrui_riskcenter.loan_homevisit_investigate where saleOrderSid = #{salesOrderSid} and saleOrderBorrowerSid = #{borrowerSid}
     </select>
+
+    <select id="selectCustomer"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer">
+        select * from anrui_riskcenter.loan_homevisit_investigate_customer where mainSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -72,6 +72,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -465,6 +466,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
                     BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(busSalesOrderVehicle.getBorrowerSid());
                     appDeliveredDetailsVo.setLoanMobile(busSalesOrderBorrower.getMobile());
+
+
                 }
                 //查询该车辆是否有挂车
                 ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
@@ -490,6 +493,51 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 appCarListVo.setDiscountUse(discountList);
                 BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
                 deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
+                if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
+                    //查询实际购车人
+                    LoanHomevisitInvestigate loanHomevisitInvestigate = baseMapper.selectByBorrowSidAndOrder(busSalesOrderVehicle.getBorrowerSid(),busSalesOrderVehicle.getSalesOrderSid());
+                    if(loanHomevisitInvestigate != null){
+                        LoanHomevisitInvestigateOtherpeo loanHomevisitInvestigateOtherpeo = baseMapper.selectVisitSid(loanHomevisitInvestigate.getSid());
+                        if(loanHomevisitInvestigateOtherpeo != null){
+                            appDeliveredDetailsVo.setTypeKey("2");
+                            appDeliveredDetailsVo.setType("其他人");
+                        }
+                        LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.selectCustomer(loanHomevisitInvestigate.getSid());
+                        if(loanHomevisitInvestigateCustomer != null){
+                            appDeliveredDetailsVo.setTypeKey("1");
+                            appDeliveredDetailsVo.setType("贷款人");
+                        }
+                        if (!query.isPcView()) {
+                            if ("2".equals(appDeliveredDetailsVo.getTypeKey())) {//其他人
+                                deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateOtherpeo.getMobile());
+                                deliveredUseMessagesVo.setCustomerType("个人");
+                                deliveredUseMessagesVo.setCustomerTypeKey("1");
+                                deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateOtherpeo.getPeoPreAddress());
+                                deliveredUseMessagesVo.setName(loanHomevisitInvestigateOtherpeo.getPeoName());
+                                deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateOtherpeo.getIdNumber());
+                            }
+                        } else {
+                            if ("2".equals(appDeliveredDetailsVo.getTypeKey())) {//其他人
+                                deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateOtherpeo.getMobile());
+                                deliveredUseMessagesVo.setCustomerType("个人");
+                                deliveredUseMessagesVo.setCustomerTypeKey("1");
+                                deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateOtherpeo.getPeoPreAddress());
+                                deliveredUseMessagesVo.setName(loanHomevisitInvestigateOtherpeo.getPeoName());
+                                deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateOtherpeo.getIdNumber());
+                            }else if("1".equals(appDeliveredDetailsVo.getTypeKey())){
+                                deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateCustomer.getBorrowerMobile());
+                                deliveredUseMessagesVo.setCustomerType("个人");
+                                deliveredUseMessagesVo.setCustomerTypeKey("1");
+                                deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateCustomer.getBorrowerPreAddress());
+                                deliveredUseMessagesVo.setName(loanHomevisitInvestigateCustomer.getBorrowerName());
+                                deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateCustomer.getBorrowerIdNumber());
+                            }
+
+                        }
+                    }
+
+                }
+
                 appCarListVo.setRealBuyer(deliveredUseMessagesVo);
                 //===============================添加资料是否齐全和资方放款是否审核
                 BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
@@ -619,21 +667,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                     AppCarListVo appCarListVo = new AppCarListVo();
                     appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
                     appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
-                    appDeliveredDetailsVo.setLoanName(busSalesOrderVehicle.getBorrowName());
-                    appDeliveredDetailsVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
-                   /* if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
-                        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(busSalesOrderVehicle.getBorrowerSid());
-                        appDeliveredDetailsVo.setLoanMobile(busSalesOrderBorrower.getMobile());
-                        //查询实际购车人
-                        LoanHomevisitInvestigate loanHomevisitInvestigate = baseMapper.selectByBorrowSidAndOrder(busSalesOrderVehicle.getBorrowerSid(),busSalesOrderVehicle.getSalesOrderSid());
-                        if(loanHomevisitInvestigate != null){
-                            LoanHomevisitInvestigateOtherpeo loanHomevisitInvestigateOtherpeo = baseMapper.selectVisitSid(loanHomevisitInvestigate.getSid());
-                            if(loanHomevisitInvestigateOtherpeo != null){
-                                appDeliveredDetailsVo.setTypeKey("2");
-                                appDeliveredDetailsVo.setType("其他人");
-                            }
-                        }
-                    }*/
                     //查询该车辆是否有挂车
                     ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
                     if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {

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

@@ -7652,12 +7652,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     public ResultBean deleteSaleOrderInputLender(String sid) {
         ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
         //删除销售订单车辆表中的贷款人的名称
-        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(sid);
-        if (busSalesOrderVehicle != null) {
-            busSalesOrderVehicle.setBorrowerSid("");
-            busSalesOrderVehicle.setBorrowName("");
-            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid());
+        busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+        if (!busSalesOrderVehicleList.isEmpty()) {
+            for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
+                busSalesOrderVehicle.setBorrowerSid("");
+                busSalesOrderVehicle.setBorrowName("");
+                busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+            }
         }
         //删除销售订单贷款表的数据
         busSalesOrderBorrowerService.deleteBySid(sid);