Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -291,7 +291,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
         if (busSalesOrderLoancontract != null) {
             //根据销售订单的贷款人sid查询车辆表中的数据
-            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(busSalesOrderLoancontract.getBorrowerSid());
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),loanContractSid);
             //这是生成业务系统融资放款应收的逻辑：
             // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
             //计算融资放款的金额以及厂家贴息金额

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -154,6 +154,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
+    BusSalesOrderVehicle selectByBorrowSid2(@Param("sid") String sid,@Param("loanContractSid") String loanContractSid);
 
     @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}")
     BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -290,6 +290,10 @@
         select * from bus_sales_order_vehicle where borrowerSid = #{sid}
     </select>
 
+    <select id="selectByBorrowSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where borrowerSid = #{sid} and loanContractSid = #{loanContractSid}
+    </select>
+
     <select id="saleOrderInputLenderVins"
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo">
         select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -598,6 +598,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByBorrowSid(sid);
     }
 
+    public BusSalesOrderVehicle selectByBorrowSid2(String sid,String loanContractSid) {
+        return baseMapper.selectByBorrowSid2(sid,loanContractSid);
+    }
+
     public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByOrderSidAndVehSid(sid, vehSid);

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

@@ -2665,7 +2665,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款
                     if (loanSolutions.getFactoryDiscount() != null) {
                         bg = bg.subtract(loanSolutions.getFactoryDiscount());
-                        pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscountUse());
+                        if(loanSolutions.getFactoryDiscount() != null){
+                            pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscount().toString());
+                        }
+
                     }
                 }
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml

@@ -33,8 +33,8 @@
 
     <delete id="deleteByLoanSid">
         delete
-        from loan_solution_detail
+        from loan_solutions_detail
-        where solutionSid = #{sid}
+        where solutionsSid = #{sid}
     </delete>
 
     <select id="selectLoanSid" resultType="com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail">

anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

@@ -282,14 +282,14 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 80px !important;
+  width: 100px !important;
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
   align-items: center;
 }
 .addinputInfo {
-  margin-left: 70px !important;
+  margin-left: 90px !important;
 }
 .tlineheightb {
   display: flex;