Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -76,6 +76,7 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
@@ -166,6 +167,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;
+    @Autowired
+    private LoanTransferPaymentApplyFeign loanTransferPaymentApplyFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -366,7 +369,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             //更新还款计划表垫款金额和逾期利息
-            if ("007".equals(finPaymentrecord.getCostTypeKey())){
+            if ("007".equals(finPaymentrecord.getCostTypeKey())) {
                 List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData();
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     log.info("车辆sid++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBusVinSid());
@@ -375,7 +378,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(loanRepaymentPlanMoneyVo.getSid()).getData();
                     String paymentMoney = loanRepaymentPlanMoneyVo.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString();
                     String paymentInterest = loanRepaymentPlanMoneyVo.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString();
-                    loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),paymentMoney,paymentInterest);
+                    loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(), paymentMoney, paymentInterest);
                     //推送金融应收
                     FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                     jr.setCreateBySid(finPaymentrecord.getCreateBySid());
@@ -397,6 +400,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     finUncollectedReceivablesDetailedJRService.insert(jr);
                 }
             }
+
             FinPaymentrecord finPaymentrecordOne = null;
             if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();
@@ -514,6 +518,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                         // 消息推送
                         messageFeign.pushNoUriMessage(pushMessageQuery);
                     });
+                } else if ("006".equals(costTypeKey)) {
+                    //推送转付记录
+                    Future future1 = pool.submit(() -> {
+                        loanTransferPaymentApplyFeign.pushPaymentRecord(finPaymentrecord.getBusSid(), finPaymentrecord.getSid());
+                    });
+                    Future future2 = pool.submit(() -> {
+                        loanTransferPaymentApplyFeign.pushPaymentVoucher(finPaymentrecord.getBusSid(), finPaymentrecord.getSid());
+                    });
                 }
             } catch (Exception e) {
                 e.printStackTrace();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java

@@ -54,6 +54,16 @@ public interface LoanTransferPaymentApplyFeign {
     public ResultBean deleteBySids(@RequestBody String[] sids);
 
 
+    @ApiOperation("推送转付记录")
+    @PostMapping("/pushPaymentRecord")
+    @ResponseBody
+    public ResultBean pushPaymentRecord(@RequestParam("sid") String sid, @RequestParam("paySid") String paySid);
+
+    @ApiOperation("推送财务代付款凭证")
+    @PostMapping("/pushPaymentVoucher")
+    @ResponseBody
+    public ResultBean pushPaymentVoucher(@RequestParam("sid") String sid, @RequestParam("paySid") String paySid);
+
     //---------------------------流程---------------------------------------
 
     @ApiOperation("提交")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java

@@ -40,6 +40,16 @@ public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymen
         return null;
     }
 
+    @Override
+    public ResultBean pushPaymentRecord(String sid, String paySid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean pushPaymentVoucher(String sid, String paySid) {
+        return null;
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitTransferDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java

@@ -54,6 +54,16 @@ public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFei
         return loanTransferPaymentApplyService.deleteBySids(sids);
     }
 
+    @Override
+    public ResultBean pushPaymentRecord(String sid, String paySid) {
+        return loanTransferPaymentApplyService.pushPaymentRecord(sid,paySid);
+    }
+
+    @Override
+    public ResultBean pushPaymentVoucher(String sid, String paySid) {
+        return loanTransferPaymentApplyService.pushPaymentVoucher(sid,paySid);
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitTransferDto dto) {
         return loanTransferPaymentApplyService.submitRecordApplication(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -187,6 +187,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
     public ResultBean<String> saveTransferPayment(LoanTransferPaymentApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = "";
+        if (StringUtils.isBlank(dto.getPayFormKey())) {
+            return rb.setMsg("请选择财务付款形式");
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
             LoanTransferPaymentApply updateEntity = fetchBySid(sid);
@@ -629,11 +632,11 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                     Set<String> setConOrNumber = new HashSet<>();
                     for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) {
                         LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
-//                        if (null != repaymentHistory) {
-//                            repaymentHistory.setPaymentStateKey("003");
-//                            repaymentHistory.setPaymentState("已转付");
-//                            repaymentHistory.setTransferDate(new DateTime());
-//                            loanRepaymentHistoryService.updateById(repaymentHistory);
+                        if (null != repaymentHistory) {
+                            repaymentHistory.setPaymentStateKey("003");
+                            repaymentHistory.setPaymentState("已转付");
+                            repaymentHistory.setTransferDate(new DateTime());
+                            loanRepaymentHistoryService.updateById(repaymentHistory);
 //                            //推送转付还款记录
 //                            LoanRepaymentHistory transfer = new LoanRepaymentHistory();
 //                            transfer.setScheduleSid(repaymentHistory.getScheduleSid());
@@ -656,7 +659,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
 //                            String amount = String.valueOf(money);
 //                            transfer.setActualMoney(new BigDecimal("-" + amount));
 //                            loanRepaymentHistoryService.insert(transfer);
-//                        }
+                        }
                         if (payFormKey.equals("01")) {
                             if (StringUtils.isNotBlank(applyRecord.getBankContractNo())) {
                                 setConOrNumber.add(applyRecord.getBankContractNo());
@@ -788,8 +791,44 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
         }
     }
 
-    private void pushPaymentVoucher(String businessSid) {
-        List<LoanTransferPaymentRecord> records = loanTransferPaymentRecordService.selByMainSid(businessSid);
+    public ResultBean pushPaymentRecord(String sid, String paySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanTransferPaymentRecord> records = loanTransferPaymentRecordService.selByMainSidAndPaySid(sid, paySid);
+        if (!records.isEmpty()) {
+            for (LoanTransferPaymentRecord applyRecord : records) {
+                LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
+                if (null != repaymentHistory) {
+                    //推送转付还款记录
+                    LoanRepaymentHistory transfer = new LoanRepaymentHistory();
+                    transfer.setScheduleSid(repaymentHistory.getScheduleSid());
+                    transfer.setPlanDetailSid(repaymentHistory.getPlanDetailSid());
+                    transfer.setReturnWay("转付");
+                    transfer.setReturnWayKey("03");
+                    transfer.setActualDate(new Date());
+                    transfer.setDataTime(new DateTime());
+                    transfer.setBuckleKey("001");
+                    transfer.setBuckle("未申请");
+                    transfer.setUpdateState("1");
+                    transfer.setUpdateTime(new DateTime());
+                    BigDecimal money = new BigDecimal(0);
+                    if (null != applyRecord.getTransferPrincipal()) {
+                        money = applyRecord.getTransferPrincipal();
+                    }
+                    if (null != applyRecord.getDefaultInterest()) {
+                        money = applyRecord.getDefaultInterest().add(money);
+                    }
+                    String amount = String.valueOf(money);
+                    transfer.setActualMoney(new BigDecimal("-" + amount));
+                    loanRepaymentHistoryService.insert(transfer);
+                }
+            }
+        }
+        return rb.success();
+    }
+
+    public ResultBean pushPaymentVoucher(String sid, String paySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanTransferPaymentRecord> records = loanTransferPaymentRecordService.selByMainSidAndPaySid(sid, paySid);
         if (!records.isEmpty()) {
             PaymentVoucher paymentVoucher = new PaymentVoucher();
             List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
@@ -889,6 +928,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             paymentVoucher.setVoucherDetails(voucherDetails);
             finKingDeeFeign.savePaymentVoucher(paymentVoucher);
         }
+        return rb.success();
     }
 
 
@@ -1231,4 +1271,6 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
         }
         return rb.success().setData(vo);
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.java

@@ -20,4 +20,6 @@ public interface LoanTransferPaymentRecordMapper extends BaseMapper<LoanTransfer
     List<LoanTransferPaymentRecord> selByMainSid(String mainSid);
 
     LoanTransferPaymentRecord selByBankContractNo(String bankContractNo);
+
+    List<LoanTransferPaymentRecord> selByMainSidAndPaySid(@Param("sid") String sid, @Param("paySid") String paySid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml

@@ -21,7 +21,14 @@
                  LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
                  LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
         WHERE p.bankContractNo = #{bankContractNo}
-        and r.state = 1
+          and r.state = 1
         ORDER BY r.createTime DESC LIMIT 1
     </select>
+    <select id="selByMainSidAndPaySid"
+            resultType="com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord">
+        select r.*
+        FROM loan_transfer_payment_record as r
+        WHERE r.mainSid = #{sid}
+          and r.paySid = #{paySid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java

@@ -27,4 +27,8 @@ public class LoanTransferPaymentRecordService extends MybatisBaseService<LoanTra
     public LoanTransferPaymentRecord selByBankContractNo(String bankContractNo) {
         return baseMapper.selByBankContractNo(bankContractNo);
     }
+
+    public List<LoanTransferPaymentRecord> selByMainSidAndPaySid(String sid, String paySid) {
+        return baseMapper.selByMainSidAndPaySid(sid,paySid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java

@@ -67,6 +67,6 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper<ScmApplyInboun
     @Select("select * from scm_apply_inbound_veh_query where mainSid = #{cgrkdSid}")
     List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid);
 
-    @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE #{vinNo}")
-    ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(String vinNo);
+    @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE CONCAT('%',#{vinNo},'%')")
+    ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(@Param("vinNo") String vinNo);
 }