Merge remote-tracking branch 'origin/master'

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-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java

@@ -14,5 +14,4 @@ public class LoanOtherReceivablePush {
     private String borrowerSid;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
-    private String loanContractSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -139,11 +139,6 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
 
-    @ApiOperation("根据贷款人sid查询车辆")
-    @GetMapping("/selectOneByBorrowerSid2")
-    @ResponseBody
-    ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("contractSid")String contractSid);
-
     @ApiOperation("根据销售订单sid和贷款人sid查车辆信息")
     @PostMapping("/selectListByOrderSidAndDkrSid")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -133,11 +133,6 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
-    @Override
-    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
-        return null;
-    }
-
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml

@@ -135,8 +135,8 @@
         from bus_handover bh
         <where>
             ${ew.sqlSegment}
-            ORDER BY createTime DESC ,id
         </where>
+        ORDER BY bh.id desc
     </select>
     <select id="selectNum" resultType="java.lang.Integer">
         select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
@@ -159,8 +159,8 @@
         from bus_handover bh
         <where>
             ${ew.sqlSegment}
-            ORDER BY createTime DESC ,id
         </where>
+        ORDER BY bh.id desc
     </select>
 
     <select id="selectVinSidByApplySid" resultType="java.lang.String">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareMapper.xml

@@ -36,6 +36,7 @@
                 , '%')
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectVinSidByApplySid" resultType="java.lang.String">

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,22 +286,29 @@ 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查询车辆表中的数据
-            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),loanContractSid);
+            List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowSid,saleOrderSid);
             //这是生成业务系统融资放款应收的逻辑：
             // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
             //计算融资放款的金额以及厂家贴息金额
             ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
             if (resultBean.getData() != null) {
                 PushVo pushVo = resultBean.getData();
+                busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+                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());
-//                unCollectionDto.setContractSid(contractSid);
                             //客户名称
                             unCollectionDto.setCustomerName(busSalesOrder.getCustomerName());
                             //客户sid
@@ -335,6 +343,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             }
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
+
+                    }
+                }
+            }
         }
         return rb.success();
     }
@@ -352,7 +364,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 //-----------获取其他应收单对象----------------
                 CapitalCreditResult creditResult = new CapitalCreditResult();
                 //根据销售订单的贷款人sid查询车辆表中的数据
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(borrowerDetailsVo.getSid(),loanOtherReceivablePush.getLoanContractSid());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(borrowerDetailsVo.getSid());
                 if (null != busSalesOrderVehicle) {
                     String customerNumber = "";
                     //判断财务系统是否有客户

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

@@ -154,7 +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);
+    List<BusSalesOrderVehicle> selectByBorrowSid2(@Param("sid") String sid,@Param("orderSid") String orderSid);
 
     @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

@@ -291,7 +291,7 @@
     </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 * from bus_sales_order_vehicle where borrowerSid = #{sid} and salesOrderSid = #{orderSid}
     </select>
 
     <select id="saleOrderInputLenderVins"

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

@@ -148,11 +148,6 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
     }
 
-    @Override
-    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
-        return busSalesOrderVehicleService.selectOneByBorrowerSid2(borrowerSid,contractSid);
-    }
-
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -598,8 +598,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByBorrowSid(sid);
     }
 
-    public BusSalesOrderVehicle selectByBorrowSid2(String sid,String loanContractSid) {
-        return baseMapper.selectByBorrowSid2(sid,loanContractSid);
+    public List<BusSalesOrderVehicle> selectByBorrowSid2(String sid,String saleOrderSid) {
+        return baseMapper.selectByBorrowSid2(sid,saleOrderSid);
     }
 
     public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
@@ -624,12 +624,6 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return rb.success().setData(busSalesOrderVehicle);
     }
 
-    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid,String contractSid) {
-        ResultBean<BusSalesOrderVehicle> rb = ResultBean.fireFail();
-        BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid2(borrowerSid,contractSid);
-        return rb.success().setData(busSalesOrderVehicle);
-    }
-
     public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
     }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -218,17 +218,18 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
             BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
             loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
-            loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
             String borrowerSid = "";
             if (loancontractDetailsVo != null) {
                 loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
                 borrowerSid = loancontractDetailsVo.getBorrowerSid();
+                loanContractPush.setBorrowSid(borrowerSid);
             }
+            //推送客户融资放款的应收未收
             ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
             //资方信审终审通过后修改车辆业务状态中的资方终审为1.
-            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid2(borrowerSid,loanCapitalCreditResult.getLoanContractSid());
+            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
             if (busSalesOrderVehicle.getData() != null) {
                 ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
             }

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());