优化测试问题

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -3744,7 +3744,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             if (planDetails.getDueDate().compareTo(collDate) >= 0) {
                                 //未逾期
                                 Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
-                                cal_1.setTime(collDate);
+                                cal_1.setTime(planDetails.getDueDate());
                                 cal_1.add(Calendar.DAY_OF_MONTH, -1);
                                 historyEntity.setPrepareDate(cal_1.getTime());
                             } else {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyDto.java

@@ -25,4 +25,5 @@ public class LoanBuckleApplyDto implements Dto {
     private String orgPath;
     private List<LoanBuckleFile> files = new ArrayList<>();
     private List<LoanBuckleHistoryRecord> records = new ArrayList<>();
+    private List<String> historySids = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java

@@ -34,6 +34,6 @@ public class LoanBuckleApplyVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("办结日期")
-    private Date closingDate;
+    private String closingDate;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleHistoryRecord.java

@@ -4,7 +4,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Administrator
@@ -40,5 +42,6 @@ public class LoanBuckleHistoryRecord {
     @ApiModelProperty("实还日期")
     private String actualDate;
 
+    private List<List> historySids = new ArrayList<>();
 }
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleplanhistory/LoanBucklePlanHistory.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loanbuckleplanhistory;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "划扣申请还款计划与记录关联表", description = "划扣申请还款计划与记录关联表")
+@TableName("loan_buckle_plan_history")
+@Data
+public class LoanBucklePlanHistory extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("还款计划sid")
+    private String planSid;
+    @ApiModelProperty("还款记录sid")
+    private String recordSid;
+    @ApiModelProperty("申请sid")
+    private String mainSid;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleplanhistory/LoanBucklePlanHistoryFeign.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loanbuckleplanhistory;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "划扣申请还款计划与记录关联表")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanBucklePlanHistory",
+        name = "anrui-riskcenter",
+        path = "v1/loanbuckleplanhistory",
+        fallback = LoanBucklePlanHistoryFeignFallback.class)
+public interface LoanBucklePlanHistoryFeign {
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleplanhistory/LoanBucklePlanHistoryFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.riskcenter.api.loanbuckleplanhistory;
+
+
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class LoanBucklePlanHistoryFeignFallback implements LoanBucklePlanHistoryFeign {
+
+
+}

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

@@ -34,7 +34,7 @@ public class LoanTransferPaymentApplyVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("办结日期")
-    private Date closingDate;
+    private String closingDate;
 
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
+import com.yxt.anrui.riskcenter.api.loanbuckleplanhistory.LoanBucklePlanHistory;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface LoanBucklePlanHistoryMapper extends BaseMapper<LoanBucklePlanHistory> {
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryMapper">
+
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryRest.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory;
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecordFeign;
+import com.yxt.anrui.riskcenter.api.loanbuckleplanhistory.LoanBucklePlanHistoryFeign;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "划扣申请还款计划与记录关联表")
+@RestController
+@RequestMapping("v1/loanbuckleplanhistory")
+public class LoanBucklePlanHistoryRest implements LoanBucklePlanHistoryFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryService.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory;
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
+import com.yxt.anrui.riskcenter.api.loanbuckleplanhistory.LoanBucklePlanHistory;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2023/7/6
+ **/
+@Service
+public class LoanBucklePlanHistoryService extends MybatisBaseService<LoanBucklePlanHistoryMapper, LoanBucklePlanHistory> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -50,5 +50,5 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
 
     List<RepaymentStatisticsExportVo> repaymentStatisticsExport(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 
-    String getMaxUpdateTimeByBankName(@Param("bankName") String bankName);
+    String getMaxUpdateTimeByBankContractNo(@Param("bankContractNo") String bankContractNo);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -177,10 +177,12 @@
     <select id="repaymentStatistics"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
         SELECT DISTINCT
-        a.*
+        a.*,
+        (SELECT c.bankBeInter FROM loan_be_padsincere_veh as c WHERE c.saleVehSid = a.busVinSid AND c.period = a.period) as bankBeInter
         FROM
         (
         SELECT
+        pd.busVinSid,
         pd.dueDate,
         s.createBySid,
         s.orgSidPath,
@@ -200,7 +202,6 @@
         pd.dueMoney,
         t.repaidMoney,
         t.outstandingMoney,
-        v.bankBeInter,
         pd.overdue as dueOverdue,
         pd.updateTime as updateDate,
         CASE
@@ -214,7 +215,6 @@
         FROM
         loan_repayment_plan_details AS pd
         LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
-        LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid
         LEFT JOIN (
         SELECT
         p.sid,
@@ -353,7 +353,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getMaxUpdateTimeByBankName" resultType="java.lang.String">
+    <select id="getMaxUpdateTimeByBankContractNo" resultType="java.lang.String">
         SELECT
             MAX(h.actualDate)
                 as updateTime
@@ -362,7 +362,7 @@
                            ON h.planDetailSid = p.sid
         where h.updateState = '1'
           AND h.returnWayKey = '01'
-          AND p.bankName = #{bankName}
+          AND p.bankContractNo = #{bankContractNo}
     </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -160,7 +160,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
                 return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2());
             } else {
-                return rb.success().setData(resultList).setMsg("成功导入数据，请点击确定按钮");
+                return rb.success().setData(resultList).setMsg("数据校验成功，请点击“确定”按钮，导入数据。");
             }
         } else {
             String checkResult = importReturn.getCheckInfo();
@@ -324,7 +324,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         if (sbcheck2.length() > 0) {
             sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
-            importReturn.setCheckInfo2("已存在" + sbcheck2.toString() + "的记录，是否继续导入");
+            importReturn.setCheckInfo2("已存在" + sbcheck2.toString() + "的记录，是否继续导入，导入点击“确定”，不导入点击”取消“。");
             return importReturn;
         }
         return importReturn;
@@ -735,7 +735,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.ne("h.buckleKey", "003");
         qw.eq("h.updateState", "0");
         List<String> histories = baseMapper.selUpdateStateList(qw);
-        HashSet<String> bankNames = new HashSet<>();
+        HashSet<String> bankContractNos = new HashSet<>();
         HashSet<String> pSids = new HashSet<>();
         String useOrgSid = "";
         if (!histories.isEmpty()) {
@@ -747,18 +747,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     baseMapper.updateById(repaymentHistory);
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(repaymentHistory.getPlanDetailSid());
                     if (null != planDetails) {
-                        bankNames.add(planDetails.getBankName());
+                        bankContractNos.add(planDetails.getBankContractNo());
                         pSids.add(planDetails.getSid());
                         useOrgSid = planDetails.getUseOrgSid();
                     }
                 }
             }
             Map<String, String> map = new HashMap<>();
-            if (!bankNames.isEmpty()) {
-                for (String bankName : bankNames) {
-                    String updateTime = baseMapper.getMaxUpdateTimeByBankName(bankName);
+            if (!bankContractNos.isEmpty()) {
+                for (String bankContractNo : bankContractNos) {
+                    String updateTime = baseMapper.getMaxUpdateTimeByBankContractNo(bankContractNo);
                     if (StringUtils.isNotBlank(updateTime)) {
-                        map.put(bankName, updateTime);
+                        map.put(bankContractNo, updateTime);
                     }
                 }
             }
@@ -1052,9 +1052,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.eq("h.returnWayKey", "02");
         if (StringUtils.isNotBlank(pagerQuery.getOverdue())) {
             if ("1".equals(pagerQuery.getOverdue())) {
-                qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')");
+                //   qw.apply("date_format (h.actualDate,'%Y-%m-%d') <= date_format(p.dueDate,'%Y-%m-%d')");
+                qw.apply("now() < p.dueDate");
             } else if ("0".equals(pagerQuery.getOverdue())) {
-                qw.apply("date_format (h.actualDate,'%Y-%m-%d') > date_format(p.dueDate,'%Y-%m-%d')");
+                qw.apply("now() >= p.dueDate");
+                //  qw.apply("date_format (h.actualDate,'%Y-%m-%d') > date_format(p.dueDate,'%Y-%m-%d')");
             }
         }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
@@ -1075,6 +1077,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getAccountTypeKey())) {
             qw.like("r.accountTypeKey", pagerQuery.getAccountTypeKey());
         }
+        qw.eq("r.state", 0);
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").

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

@@ -39,7 +39,7 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     List<LoanRepaymentPlanDetails> planList();
 
-    int updateTime(@Param("bankName")String bankName,@Param("updateTime") Date updateTime,@Param("useOrgSid") String useOrgSid);
+    int updateTime(@Param("bankContractNo")String bankContractNo,@Param("updateTime") Date updateTime,@Param("useOrgSid") String useOrgSid);
 
     List<HistoryOverDueVo> overDueVoList(@Param("useOrgSid") String useOrgSid);
 

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

@@ -4,7 +4,7 @@
     <update id="updateTime">
         UPDATE loan_repayment_plan_details
         SET updateTime = #{updateTime}
-        WHERE bankName = #{bankName}
+        WHERE bankContractNo = #{bankContractNo}
           and useOrgSid = #{useOrgSid};
     </update>
     <update id="updateOverDueState">

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

@@ -113,8 +113,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
         return baseMapper.planList();
     }
 
-    public int updateTime(String bankName, Date updateTime, String useOrgSid) {
-        return baseMapper.updateTime(bankName, updateTime, useOrgSid);
+    public int updateTime(String bankContractNo, Date updateTime, String useOrgSid) {
+        return baseMapper.updateTime(bankContractNo, updateTime, useOrgSid);
     }
 
     public List<HistoryOverDueVo> overDueVoList(String useOrgSid) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -68,6 +68,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessagePushTransferDto;
 import com.yxt.messagecenter.api.message.PushMessageQuery;
+import com.yxt.messagecenter.api.message.PushSmsDto;
 import com.yxt.messagecenter.api.messagelist.MessageListDto;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1135,9 +1136,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             day = sDay;
                         }
                         String contentCustomer = "尊敬的客户：您的车架号为" + vinNo + "车辆，首期还款日为" + month + "月" + day + "日，期数为" + period + "期，每月" + day + "日为您的还款日，请及时还款。";
-                        String res = MsgWs.SendWaitWorkMsg(customerPhone, contentCustomer);
-                        System.out.println("还款发送短信：" + res);
-                        System.out.println(contentCustomer);
+                        PushSmsDto pushSmsDto = new PushSmsDto();
+                        pushSmsDto.setMobile(customerPhone);
+                        pushSmsDto.setMsg(contentCustomer);
+                        messageFeign.pushSms(pushSmsDto);
                         String contentStaff = "您的贷款客户" + customer + "的还款计划表已生成";
 //                        //消息推送
 //                        MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java

@@ -17,6 +17,8 @@ import com.yxt.common.base.utils.MsgWs;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessagePushTransferDto;
+import com.yxt.messagecenter.api.message.PushMessageQuery;
+import com.yxt.messagecenter.api.message.PushSmsDto;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -169,8 +171,10 @@ public class ScheduledRepaymentService {
                             day = sDay;
                         }
                         String contentCustomer = "尊敬的客户：您的车牌号为" + vinMark + "车辆，还款日为" + month + "月" + day + "日，请及时还款。";
-                        String res = MsgWs.SendWaitWorkMsg(customerPhone, contentCustomer);
-                        System.out.println("还款发送短信：" + res);
+                        PushSmsDto pushSmsDto = new PushSmsDto();
+                        pushSmsDto.setMobile(customerPhone);
+                        pushSmsDto.setMsg(contentCustomer);
+                        messageFeign.pushSms(pushSmsDto);
                         System.out.println(contentCustomer);
                         if (StringUtils.isNotBlank(entity.getMainStartDate())) {
                             String beforeThreeDay = loanRepaymentScheduleService.beforeThreeDay(entity.getMainStartDate());
@@ -192,21 +196,33 @@ public class ScheduledRepaymentService {
                                 }
                                 String contentStaff = "您的贷款客户" + customer + "的车辆首期还款日为" + m + "月" + d + "日，请及时提醒客户。";
                                 System.out.println(contentStaff);
-                                //消息推送
-                                MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
-                                messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
-                                messagePushTransferDto.setMsgType("业务");
-                                messagePushTransferDto.setMsgTitle("提醒客户还款");
-                                messagePushTransferDto.setMsgContent(contentStaff);
-                                messagePushTransferDto.setMsgSource("还款计划表");
-                                messagePushTransferDto.setSenderSid(sendSid);
-                                messagePushTransferDto.setSenderName(sendName);
-                                messagePushTransferDto.setSenderDeptSid(sendDeptSid);
-                                messagePushTransferDto.setSenderDeptName(sendDept);
-                                messagePushTransferDto.setBusinessSid(schedule.getSid());
-                                messagePushTransferDto.setReceiveSids(staffSid);
-                                messagePushTransferDto.setReceiveNames(staffName);
-                                messageFeign.pushTransferMessage(messagePushTransferDto);
+                                //发送通知给销售专员
+                                List<String> receIveUserSidList = new ArrayList<>();
+                                receIveUserSidList.add(staffSid);
+                                PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                                pushMessageQuery.setReceivedSids(receIveUserSidList);
+                                pushMessageQuery.setModuleName("风控");
+                                pushMessageQuery.setMsgContent(contentStaff);
+                                pushMessageQuery.setApp_type("2");
+                                pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+                                pushMessageQuery.setMsgTitle("还款计划提醒");
+                                // 消息推送
+                                messageFeign.pushNoUriMessage(pushMessageQuery);
+//                                //消息推送
+//                                MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
+//                                messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
+//                                messagePushTransferDto.setMsgType("业务");
+//                                messagePushTransferDto.setMsgTitle("提醒客户还款");
+//                                messagePushTransferDto.setMsgContent(contentStaff);
+//                                messagePushTransferDto.setMsgSource("还款计划表");
+//                                messagePushTransferDto.setSenderSid(sendSid);
+//                                messagePushTransferDto.setSenderName(sendName);
+//                                messagePushTransferDto.setSenderDeptSid(sendDeptSid);
+//                                messagePushTransferDto.setSenderDeptName(sendDept);
+//                                messagePushTransferDto.setBusinessSid(schedule.getSid());
+//                                messagePushTransferDto.setReceiveSids(staffSid);
+//                                messagePushTransferDto.setReceiveNames(staffName);
+//                                messageFeign.pushTransferMessage(messagePushTransferDto);
                             }
                         }
                     }

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

@@ -26,4 +26,6 @@ public interface LoanTransferPaymentApplyMapper extends BaseMapper<LoanTransferP
     IPage<LoanTransferPaymentApplyVo> listPage(IPage<LoanTransferPaymentApply> page,@Param(Constants.WRAPPER) QueryWrapper<LoanTransferPaymentApply> qw);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    LoanTransferPaymentRecordVo paymentDetails(String sid);
 }

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

@@ -13,17 +13,18 @@
                p.period,
                p.borrowerName,
                date_format(h.actualDate, '%Y-%m-%d') AS actualDate,
-               h.actualMoney,
-               r.spread,
-               r.transferPrincipal,
-               r.defaultInterest,
-               r.accountType,
-               r.accountTypeKey,
-               r.account,
-               r.accountNumber
+               h.actualMoney
+--                ,
+--                r.spread,
+--                r.transferPrincipal,
+--                r.defaultInterest,
+--                r.accountType,
+--                r.accountTypeKey,
+--                r.account,
+--                r.accountNumber
         FROM loan_repayment_history AS h
                  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
+--                  LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
         where h.sid = #{sid}
     </select>
     <select id="selectNum" resultType="java.lang.Integer">
@@ -50,6 +51,30 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="paymentDetails"
+            resultType="com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentRecordVo">
+        SELECT h.sid                                 as recordSid,
+               p.loanContractNo,
+               p.vinNo,
+               p.bankContractNo,
+               p.bankName,
+               p.customer,
+               p.period,
+               p.borrowerName,
+               date_format(h.actualDate, '%Y-%m-%d') AS actualDate,
+               h.actualMoney,
+               r.spread,
+               r.transferPrincipal,
+               r.defaultInterest,
+               r.accountType,
+               r.accountTypeKey,
+               r.account,
+               r.accountNumber
+        FROM loan_repayment_history AS h
+                 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 r.sid = #{sid}
+    </select>
     <update id="updateFlowFiled">
         UPDATE loan_transfer_payment_apply
         SET nodeState=#{nodeState}

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

@@ -371,8 +371,8 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             List<LoanTransferPaymentRecordVo> recordList = new ArrayList<>();
             if (!records.isEmpty()) {
                 for (LoanTransferPaymentRecord record : records) {
-                    String historySid = record.getRepaymentHistorySid();
-                    LoanTransferPaymentRecordVo recordVo = baseMapper.paymentInfo(historySid);
+                  //  String historySid = record.getRepaymentHistorySid();
+                    LoanTransferPaymentRecordVo recordVo = baseMapper.paymentDetails(record.getSid());
                     recordList.add(recordVo);
                 }
             }
@@ -763,7 +763,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                     ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
                             1000, TimeUnit.MILLISECONDS,
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
-                    //推送划扣凭证
+                    //推送转付凭证
                     Future future = pool.submit(() -> {
                         pushPaymentVoucher(businessSid);
                     });
@@ -1010,6 +1010,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                     List<LoanTransferPaymentRecord> loanTransferPaymentRecords = loanTransferPaymentRecordService.selByMainSid(query.getBusinessSid());
                     if (!loanTransferPaymentRecords.isEmpty()) {
                         for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) {
+                            //作废记录
+                            applyRecord.setState(0);
+                            loanTransferPaymentRecordService.updateById(applyRecord);
                             LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
                             if (null != repaymentHistory) {
                                 repaymentHistory.setPaymentStateKey("001");
@@ -1036,6 +1039,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                         List<LoanTransferPaymentRecord> loanTransferPaymentRecords = loanTransferPaymentRecordService.selByMainSid(query.getBusinessSid());
                         if (!loanTransferPaymentRecords.isEmpty()) {
                             for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) {
+                                //作废记录
+                                applyRecord.setState(0);
+                                loanTransferPaymentRecordService.updateById(applyRecord);
                                 LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
                                 if (null != repaymentHistory) {
                                     repaymentHistory.setPaymentStateKey("001");
@@ -1164,7 +1170,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             if (!applyRecords.isEmpty()) {
                 for (LoanTransferPaymentRecord applyRecord : applyRecords) {
                     String historySid = applyRecord.getRepaymentHistorySid();
-                    LoanTransferPaymentRecordVo data = baseMapper.paymentInfo(historySid);
+                    LoanTransferPaymentRecordVo data = baseMapper.paymentDetails(applyRecord.getSid());
                     if (null != data) {
                         AppTransferRecordVo appRecordVo = new AppTransferRecordVo();
                         if (StringUtils.isNotBlank(data.getLoanContractNo())) {

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

@@ -21,6 +21,7 @@
                  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
         ORDER BY r.createTime DESC LIMIT 1
     </select>
 </mapper>