Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -848,6 +848,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         LoanBePadsincereApply loanBePadsincereApply = fetchBySid(businessSid);
+        List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(loanBePadsincereApply.getSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
@@ -871,22 +872,23 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                finPaymentrecordDto.setApplySid("");
+                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
                     finPaymentrecordDto.setPayCompanySid("");
-                finPaymentrecordDto.setPayType(0);
+                    finPaymentrecordDto.setPayType(1);
                     finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
                     finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
-                finPaymentrecordDto.setCostTypeKey("");
-                finPaymentrecordDto.setCostTypeValue("");
-                finPaymentrecordDto.setCostTitleKey("");
-                finPaymentrecordDto.setCostTitleValue("");
-                finPaymentrecordDto.setReceiveBank("");
-                finPaymentrecordDto.setReceiveBankAccount("");
+                    finPaymentrecordDto.setCostTypeKey("007");
+                    finPaymentrecordDto.setCostTypeValue("垫款");
+                    finPaymentrecordDto.setCostTitleKey("008");
+                    finPaymentrecordDto.setCostTitleValue("月还");
+                    finPaymentrecordDto.setReceiveBank(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
+                    finPaymentrecordDto.setReceiveBankAccount(loanBePadsincereVehDetailsVo.getBankCollectionNum());
                     finPaymentrecordDto.setReceiveCompany("");
-                finPaymentrecordDto.setCost(0);
-                finPaymentrecordDto.setAccountsReceive(0);
-                finPaymentrecordDto.setBusSid("");
+                    finPaymentrecordDto.setCost(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setAccountsReceive(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());
                     finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
                     finPaymentrecordDto.setPayCode("");
                     finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
@@ -896,6 +898,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     finPaymentrecordDto.setPurchaseSystemName("");
                     finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
+                }
             } else {
                 //极光推送
                 loanBePadsincereApply = fetchBySid(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -53,6 +53,7 @@
           AND lrpd.period = #{period}
           AND lrpd.bankContractNo = #{bankContractNo}
           AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
+          AND lrh.`updateState` = '1'
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)
     </select>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java

@@ -56,6 +56,10 @@ public class AppBeCollectionVehDetailsVo implements Vo {
 
     @ApiModelProperty("是否有担保人")
     private Boolean showDbr = false;
+    @ApiModelProperty("是否有还款协议")
+    private Boolean showXy = false;
+    @ApiModelProperty("是否有远程控制")
+    private Boolean showYckz = false;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
     @ApiModelProperty("贷款合同编号")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -307,9 +307,15 @@ public class BeCollectionService {
             AppBeCollectionVehDetailsVo appBeCollectionVehDetailsVo = new AppBeCollectionVehDetailsVo();
             appBeCollectionVehDetailsVo.setSaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
             LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(loanBeCollectionVehDetail.getSaleVehSid()).getData();
-            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())) {
+            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName()) && collMeasures.contains("增加担保人")) {
                 appBeCollectionVehDetailsVo.setShowDbr(true);
             }
+            if (collMeasures.contains("远程控制")){
+                appBeCollectionVehDetailsVo.setShowYckz(true);
+            }
+            if (collMeasures.contains("签订还款协议")){
+                appBeCollectionVehDetailsVo.setShowXy(true);
+            }
             appBeCollectionVehDetailsVo.setContractId(loanBeCollectionVehDetail.getLoanContractNo());
             appBeCollectionVehDetailsVo.setVin(loanBeCollectionVehDetail.getVinNo());
             appBeCollectionVehDetailsVo.setCarNum(loanBeCollectionVehDetail.getCarNum());