金融方案优化

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loansolutions;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
@@ -36,6 +37,8 @@ public interface LoanSolutionsMapper extends BaseMapper<LoanSolutions> {
 
     BusSalesOrderPrice selectByPriceSid(String busSid);
 
+    BusSalesOrder seletByBusSids(String busSid);
+
 
    /* IPage<LoanSolutionsVo> selectPageVo(IPage<LoanSolutions> page, @Param(Constants.WRAPPER) Wrapper<LoanSolutions> qw);
 

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

@@ -79,4 +79,8 @@
     <select id="selectByPriceSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice">
         select * from anrui_buscenter.bus_sales_order_price where salesOrderSid = #{busSid}
     </select>
+
+    <select id="seletByBusSids" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where sid = #{busSid}
+    </select>
 </mapper>

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

@@ -1221,7 +1221,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         LoanSolutions loanSolutions = baseMapper.selectByBusSid(busSid);
         boolean isOrder = false;
         BigDecimal orderPrice = BigDecimal.ZERO;
-        if(loanSolutions != null && loanSolutions.getSaleOrderState() == 0){//销售订单
+        if(loanSolutions != null){//销售订单
+            BusSalesOrder busSalesOrder = baseMapper.seletByBusSids(busSid);
+            if(busSalesOrder != null){
                 isOrder = true;
                 BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPriceSid(busSid);
                 if(busSalesOrderPrice == null){
@@ -1229,6 +1231,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 }
                 orderPrice = busSalesOrderPrice.getSingleFinalPrice();
             }
+        }
         CalculateVo calculateVo = new CalculateVo();
         //计算的初始化
         BigDecimal loanTotal = BigDecimal.ZERO;//融资项目总额