Merge remote-tracking branch 'origin/master'

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

@@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
@@ -127,6 +129,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     private LoanFinPolicyFeign loanFinPolicyFeign;
     @Autowired
     private LoanFinBankFeign loanFinBankFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
 
     private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -380,8 +384,11 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 if (!busSalesOrderVehicleList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
                         String vinNoCode = "";
-                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                            vinNoCode = busSalesOrderVehicle.getLinkNo();
+                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                            BaseVehicleSelectVo data = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()).getData();
+                            if (null != data) {
+                                vinNoCode = data.getVinNo();
+                            }
                         }
                         String customerNumber = "";
                         //判断财务系统是否有客户

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -616,7 +616,11 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                         }
 
                                     }
-                                    finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    if (StringUtils.isBlank(finBillApplication.getIsLQOrigInvoice())){
+                                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    }else {
+                                        finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                                    }
                                     finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
                                 }
                             }
@@ -664,7 +668,11 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                             }
 
                                         }
-                                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                                        if (StringUtils.isBlank(finBillApplication.getIsLQOrigInvoice())){
+                                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                                        }else {
+                                            finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                                        }
                                         finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
                                     }
                                 }
@@ -860,7 +868,11 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                     }
 
                                 }
-                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                                if (StringUtils.isBlank(finBillApplication.getIsLQOrigInvoice())){
+                                    finVehicleInvoiceDto.setIsTakeTicket("是");
+                                }else {
+                                    finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                                }
                                 finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
                             }
                         }
@@ -908,7 +920,11 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                         }
 
                                     }
-                                    finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    if (StringUtils.isBlank(finBillApplication.getIsLQOrigInvoice())){
+                                        finVehicleInvoiceDto.setIsTakeTicket("是");
+                                    }else {
+                                        finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                                    }
                                     finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
                                 }
                             }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json

@@ -50,7 +50,7 @@
   "FNOTAXAMOUNT": "0",
   "FTAXAMOUNT": "0",
   "FCancelStatus": "",
-  "FAR_OtherRemarks": "@KD_FAR_OtherRemarks",
+  "FAR_OtherRemarks": "",
   "FScanPoint": {
     "FNUMBER": ""
   },

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java

@@ -85,4 +85,9 @@ public interface LoanCapitalCreditResultFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanCapitalCreditResultDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("重推财务")
+    @PostMapping("/rePush")
+    public ResultBean rePush(@RequestParam("sid") String sid);
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java

@@ -79,4 +79,9 @@ public class LoanCapitalCreditResultFeignFallback implements LoanCapitalCreditRe
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loancapitalcreditresult/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean rePush(String sid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java

@@ -22,4 +22,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi
     public ResultBean<String> saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean rePush(String salesOrderSid) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java

@@ -37,5 +37,8 @@ public interface LoanNoGuaranteeCreditReviewFeign {
     @PostMapping("/saveReviewInfo")
     public ResultBean<String> saveReviewInfo(@RequestBody LoanNoGuaranteeCreditReviewDto dto);
 
+    @ApiOperation("重推财务")
+    @PostMapping("/rePush")
+    public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid);
 
 }

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

@@ -64,12 +64,12 @@ public interface LoanCapitalCreditResultMapper extends BaseMapper<LoanCapitalCre
     @Select("select * from loan_capital_credit_result")
     List<LoanCapitalCreditResultVo> selectListVo();
 
-    @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid}")
-    void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult);
+    @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},isCompInvoic = #{isCompInvoic},state = '2' where sid = #{dtoSid}")
+    void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult, @Param("isCompInvoic") String isCompInvoic);
 
     int setState(String loanConcatSid);
 
-   /* int setState2(String borrowerSid);*/
+    /* int setState2(String borrowerSid);*/
 
     int selectCoun(String loanConcatSid);
 

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

@@ -100,4 +100,9 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign
         LoanCapitalCreditResultDetailsVo vo = loanCapitalCreditResultService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean rePush(String sid) {
+        return loanCapitalCreditResultService.rePush(sid);
+    }
 }

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

@@ -204,8 +204,8 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         for (LoanCapitalCreditResultVo record : pagging.getRecords()) {
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
             LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
-            if (loanSolutions != null){
-                if (loanSolutions.getTrailerAmount().compareTo(BigDecimal.ZERO) == 1){
+            if (loanSolutions != null) {
+                if (loanSolutions.getTrailerAmount().compareTo(BigDecimal.ZERO) == 1) {
                     record.setIsHavTrailer(true);
                 }
             }
@@ -225,7 +225,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0) {
             return rb.setMsg("请上传附件");
         }
-        baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult());
+        baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult(), dto.getIsCompInvoic());
         busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo());
         LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(dtoSid);
         //推送放款资料审核
@@ -369,4 +369,28 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         }
         return rb.success().setData(xsfjImages);
     }
+
+    public ResultBean rePush(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(sid);
+        if (null != loanCapitalCreditResult) {
+            LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
+            BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
+            loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
+            if (loancontractDetailsVo != null) {
+                loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
+            }
+            String isKP = "";
+            if (StringUtils.isNotBlank(loanCapitalCreditResult.getIsCompInvoic())) {
+                isKP = loanCapitalCreditResult.getIsCompInvoic();
+            } else {
+                isKP = "0";
+            }
+            loanOtherReceivablePush.setIsCompInvoic(isKP);
+            //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
+            ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
+        }
+        return rb.success();
+    }
 }

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

@@ -35,4 +35,9 @@ public class LoanNoGuaranteeCreditReviewRest implements LoanNoGuaranteeCreditRev
     public ResultBean<String> saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) {
         return loanNoGuaranteeCreditReviewService.saveReviewInfo(dto);
     }
+
+    @Override
+    public ResultBean rePush(String salesOrderSid) {
+        return loanNoGuaranteeCreditReviewService.rePush(salesOrderSid);
+    }
 }

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

@@ -273,4 +273,36 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
         }
         return rb.success().setData(borrowerSid);
     }
+
+    public ResultBean rePush(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(sid);
+        if (null != entity) {
+            if (StringUtils.isNotBlank(entity.getCreditReview())) {
+                if (!entity.getCreditReview().equals("通过")) {
+                    return rb.setMsg("请选择信审通过的数据进行操作");
+                }
+                BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(sid).getData();
+                if (null != borrowerDetailsVo) {
+                    //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
+                    LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush();
+                    loanOtherReceivablePush.setBorrowerSid(sid);
+                    loanOtherReceivablePush.setSaleOrderSid(borrowerDetailsVo.getSalesOrderSid());
+                    String isKP = "";
+                    if (StringUtils.isNotBlank(entity.getIsCompInvoic())) {
+                        isKP = entity.getIsCompInvoic();
+                    } else {
+                        isKP = "0";
+                    }
+                    loanOtherReceivablePush.setIsCompInvoic(isKP);
+                    ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
+                }
+            } else {
+                return rb.setMsg("请选择信审通过的数据进行操作");
+            }
+        } else {
+            return rb.setMsg("请选择信审通过的数据进行操作");
+        }
+        return rb.success();
+    }
 }