优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java

@@ -15,4 +15,6 @@ public class LoanContractPush {
     private String loanContractSid;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+
+    private String borrowSid;
 }

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

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForRepayVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -88,4 +89,6 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
 
     @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{saleOrderBorrowerSid}")
     List<BusSalesOrderLoancontract> fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
+
+    FinUncollectedReceivablesDetailed selectByBusVinSId(@Param("name") String name, @Param("sid") String sid);
 }

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

@@ -41,4 +41,9 @@
         WHERE loanContractNo LIKE CONCAT('%', #{contractNo}, '%')
         ORDER BY loanContractNo DESC LIMIT 1
     </select>
+
+    <select id="selectByBusVinSId"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
+        select * from anrui_fin.fin_uncollected_receivables_detailed where busVinSid = #{sid} and receivablesName = #{name}
+    </select>
 </mapper>

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

@@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -285,13 +286,15 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
         ResultBean rb = ResultBean.fireFail();
         String saleOrderSid = loanContractPush.getSaleOrderSid();
-        String loanContractSid = loanContractPush.getLoanContractSid();
+//        String loanContractSid = loanContractPush.getLoanContractSid();
+        String borrowSid = loanContractPush.getBorrowSid();
         BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(saleOrderSid);
+        BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(borrowSid);
         //根据消贷合同查询贷款人
-        BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
-        if (busSalesOrderLoancontract != null) {
+//        BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
+        if (busSalesOrderBorrower != null) {
             //根据销售订单的贷款人sid查询车辆表中的数据
-            List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),saleOrderSid);
+            List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowSid,saleOrderSid);
             //这是生成业务系统融资放款应收的逻辑：
             // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
             //计算融资放款的金额以及厂家贴息金额
@@ -302,6 +305,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 if(!busSalesOrderVehicleList.isEmpty()){
                     for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
+                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = baseMapper.selectByBusVinSId("融资放款",busSalesOrderVehicle.getSid());
+                        if(finUncollectedReceivablesDetailed == null){
                             UnCollectionDto unCollectionDto = new UnCollectionDto();
                             unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                             //客户名称
@@ -338,6 +343,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             }
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
+
+                    }
                 }
             }
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -221,7 +221,9 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             if (loancontractDetailsVo != null) {
                 loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
                 borrowerSid = loancontractDetailsVo.getBorrowerSid();
+                loanContractPush.setBorrowSid(borrowerSid);
             }
+            //推送客户融资放款的应收未收
             ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -134,6 +134,11 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
                     if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(entity.getCreditReview())) {
                         BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
                         if (null != borrowerDetailsVo) {
+                            //推送客户融资放款的应收未收
+                            LoanContractPush loanContractPush = new LoanContractPush();
+                            loanContractPush.setSaleOrderSid(borrowerDetailsVo.getSalesOrderSid());
+                            loanContractPush.setBorrowSid(creditReview.getBorrowerSid());
+                            ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
                             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
                             LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
                             loanOtherReceivablePush.setBorrowerSid(creditReview.getBorrowerSid());
@@ -175,6 +180,11 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
                     if ("通过".equals(creditReview.getCreditReview())) {
                         BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
                         if (null != borrowerDetailsVo) {
+                            //推送客户融资放款的应收未收
+                            LoanContractPush loanContractPush = new LoanContractPush();
+                            loanContractPush.setSaleOrderSid(borrowerDetailsVo.getSalesOrderSid());
+                            loanContractPush.setBorrowSid(creditReview.getBorrowerSid());
+                            ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
                             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
                             LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
                             loanOtherReceivablePush.setBorrowerSid(creditReview.getBorrowerSid());