资方划扣明细查询增加需调整逻辑

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -72,6 +72,12 @@ public interface FinPaymentrecordFeign {
     @ResponseBody
     public ResultBean save(@RequestBody FinPaymentrecordDto dto);
 
+    @ApiOperation("新增")
+    @PostMapping("/saveReturnSid")
+    @ResponseBody
+    public ResultBean<String> saveReturnSid(@RequestBody FinPaymentrecordDto dto);
+
+
     @ApiOperation("修改")
     @PostMapping("/update")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -66,6 +66,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
         return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");
     }
 
+    @Override
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return null;

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

@@ -77,6 +77,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
         return finPaymentrecordService.saveDto(dto);
     }
 
+    @Override
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        return finPaymentrecordService.saveReturnSid(dto);
+    }
+
     @Override
     public ResultBean update(FinPaymentrecordUpdateDto dto) {
         return finPaymentrecordService.updateAll(dto);

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

@@ -330,6 +330,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
+    public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentrecord finPaymentrecord = new FinPaymentrecord();
+        BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
+        baseMapper.insert(finPaymentrecord);
+        return rb.success().setData(finPaymentrecord.getSid());
+    }
+
     public ResultBean updateAll(FinPaymentrecordUpdateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<String> sids = dto.getSids();
@@ -390,7 +398,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 }
             }
             FinPaymentrecord finPaymentrecordOne = null;
-            if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive())<0) {//实收金额小于应收金额
+            if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();
                 BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
                 finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive().subtract(new BigDecimal(dto.getCost())));
@@ -566,7 +574,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         }
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
         if (finPaymentrecord.getCost() != null
-                && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO)>0) {
+                && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {
             ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
             //应付金额
             fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
@@ -1072,4 +1080,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         }
         return rb.success();
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryQuery.java

@@ -56,4 +56,5 @@ public class LoanRepaymentHistoryQuery implements Query {
     private String menuUrl;
     @ApiModelProperty("用户sid")
     private String userSid;
+    private String change; //需调整按钮查询 0/1 “1”时生效
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java

@@ -39,4 +39,7 @@ public class LoanTransferPaymentRecord extends BaseEntity {
     private String accountNumber;
     @ApiModelProperty("资方合同号")
     private String bankContractNo;
+    @ApiModelProperty("出纳代付款列表sid")
+    private String paySid;
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -24,7 +25,7 @@ public interface LoanRedemptionApplyMapper extends BaseMapper<LoanRedemptionAppl
 
     RedemptionInitVo redemptionInit(@Param("ledgerSid") String ledgerSid);
 
-    RedemptionVinList selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid);
+    List<RedemptionVinList> selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid);
 
     int updateFlowFiled(Map<String, Object> map);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml

@@ -97,6 +97,8 @@
                sid as ledgerSid
         FROM loan_return_veh_ledger as t
         WHERE t.pSid = #{ledgerSid}
+          and t.disposal = '未处置'
+          and t.stockState = '库存'
     </select>
     <select id="selTrailerByMainLedgerSid" resultType="java.lang.String">
         SELECT sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -323,9 +323,11 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
             mainVeh.setLedgerSid(ledgerSid);
             vinList.add(mainVeh);
             if (StringUtils.isNotBlank(redemptionInitVo.getLedgerSid())) {
-                RedemptionVinList trailerVeh = baseMapper.selTrailerByLedgerSid(redemptionInitVo.getLedgerSid());
-                if (null != trailerVeh) {
-                    vinList.add(trailerVeh);
+                List<RedemptionVinList> trailerVeh = baseMapper.selTrailerByLedgerSid(redemptionInitVo.getLedgerSid());
+                if (!trailerVeh.isEmpty()) {
+                    trailerVeh.stream().forEach(t -> {
+                        vinList.add(t);
+                    });
                 }
             }
             vo.setVinList(vinList);

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

@@ -38,7 +38,7 @@
     </select>
     <select id="monthListPage"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryVo">
-        SELECT
+        SELECT m.* FROM (SELECT
         h.sid,
         p.loanContractNo,
         p.vinNo,
@@ -50,19 +50,77 @@
         p.dueDate,
         p.dueMoney,
         h.actualDate,
-        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
+        date_format( h.dataTime, '%Y-%m-%d' ) AS dataTime,
         h.actualMoney,
         h.buckle,
         h.returnWay,
+        h.returnWayKey,
+        h.buckleKey,
         h.planDetailSid,
-        CASE h.updateState
-        WHEN '0' THEN '未更新'
-        WHEN '1' THEN '已更新'
+        t.outstandingMoney,
+        t.repaidMoney,
+        p.orgSidPath,
+        p.salesUserSid,
+        CASE
+        h.updateState
+        WHEN '0' THEN
+        '未更新'
+        WHEN '1' THEN
+        '已更新'
         END AS updateState,
-        date_format(h.updateTime, '%Y-%m-%d') as updateTime
+        date_format( h.updateTime, '%Y-%m-%d' ) AS updateTime
         FROM
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
+        LEFT JOIN (
+        SELECT
+        p.sid,
+        IFNULL((SELECT
+        SUM(
+        IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'),0) as repaidMoney
+        ,
+        IFNULL(
+        (p.dueMoney - IFNULL((SELECT
+        SUM(IFNULL( h.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS h
+        WHERE
+        h.planDetailSid = p.sid
+        AND h.updateState = '1'
+        ),0)),0) AS outstandingMoney
+        FROM
+        loan_repayment_plan_details AS p
+        ) AS t ON p.sid = t.sid) as m
+--         SELECT
+--         h.sid,
+--         p.loanContractNo,
+--         p.vinNo,
+--         p.bankContractNo,
+--         p.bankName,
+--         p.customer,
+--         p.period,
+--         p.borrowerName,
+--         p.dueDate,
+--         p.dueMoney,
+--         h.actualDate,
+--         date_format(h.dataTime, '%Y-%m-%d') as dataTime,
+--         h.actualMoney,
+--         h.buckle,
+--         h.returnWay,
+--         h.planDetailSid,
+--         CASE h.updateState
+--         WHEN '0' THEN '未更新'
+--         WHEN '1' THEN '已更新'
+--         END AS updateState,
+--         date_format(h.updateTime, '%Y-%m-%d') as updateTime
+--         FROM
+--         loan_repayment_history AS h
+--         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -100,7 +158,7 @@
         select *
         from loan_repayment_history
         where planDetailSid = #{planSid}
-          and returnWayKey != '02'
+--           and returnWayKey != '02'
         and updateState = '1'
     </select>
     <select id="selUpdateStateList" resultType="java.lang.String">

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

@@ -468,18 +468,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             String orgLevelKey = defaultIdReltBean.getData();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("m.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+                qw.eq("m.salesUserSid", pagerQuery.getUserSid());
             } else {
                 PagerVo<LoanRepaymentHistoryVo> p = new PagerVo<>();
                 return p;
@@ -490,132 +490,79 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         //=======================
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+            qw.like("m.loanContractNo", pagerQuery.getLoanContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
-            qw.like("p.vinNo", pagerQuery.getVinNo());
+            qw.like("m.vinNo", pagerQuery.getVinNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
-            qw.like("p.bankName", pagerQuery.getBankName());
+            qw.like("m.bankName", pagerQuery.getBankName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
-            qw.like("p.bankContractNo", pagerQuery.getBankContractNo());
+            qw.like("m.bankContractNo", pagerQuery.getBankContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getCustomer())) {
-            qw.like("p.customer", pagerQuery.getCustomer());
+            qw.like("m.customer", pagerQuery.getCustomer());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
-            qw.like("p.borrowerName", pagerQuery.getBorrowerName());
+            qw.like("m.borrowerName", pagerQuery.getBorrowerName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
-            qw.like("p.period", pagerQuery.getPeriod());
+            qw.like("m.period", pagerQuery.getPeriod());
         }
         if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
-            qw.eq("h.returnWayKey", pagerQuery.getReturnWayKey());
+            qw.eq("m.returnWayKey", pagerQuery.getReturnWayKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
-            qw.eq("h.buckleKey", pagerQuery.getBuckleKey());
+            qw.eq("m.buckleKey", pagerQuery.getBuckleKey());
         } else {
-            qw.ne("h.buckleKey", "002");
-            qw.ne("h.buckleKey", "003");
+            qw.ne("m.buckleKey", "002");
+            qw.ne("m.buckleKey", "003");
         }
-        qw.ne("h.returnWayKey", "02");
+        qw.ne("m.returnWayKey", "02");
         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')").
-                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (m.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (m.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
                 );
-//        List<String> monthHeadAndLast = getMonthHeadAndLast(new Date());
-//        String head = monthHeadAndLast.get(0);
-//        String last = monthHeadAndLast.get(1);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String actualStartDate = pagerQuery.getActualStartDate();
         String actualEndDate = pagerQuery.getActualEndDate();
-        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (m.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (m.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
                 );
-//        try {
-//            Date headT = sdf.parse(head);
-//            Date lastT = sdf.parse(last);
-//            Date ast = null;
-//            Date aed = null;
-//            if (StringUtils.isNotBlank(actualStartDate)) {
-//                ast = sdf.parse(actualStartDate);
-//            }
-//            if (StringUtils.isNotBlank(actualEndDate)) {
-//                aed = sdf.parse(actualEndDate);
-//            }
-//
-//            if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
-//                if (aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            } else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) {
-//                if (headT.before(ast)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                } else {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            } else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) {
-//                if (headT.before(ast) && aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else if (headT.before(ast) && !aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')"
-//                            );
-//                } else if (!headT.before(ast) && aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
-//                            );
-//                } else if (!headT.before(ast) && !aed.before(lastT)) {
-//                    qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-//                            apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
-//                            );
-//                }
-//            }
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-
         String dataStartTime = pagerQuery.getDataStartTime();
         String dataEndTime = pagerQuery.getDataEndTime();
-        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (h.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (m.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (m.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
                 );
-        qw.orderByDesc("h.dataTime");
-        IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw);
-        List<LoanRepaymentHistoryVo> records = pagging.getRecords();
-        records.removeAll(Collections.singleton(null));
-        if (!records.isEmpty()) {
-            for (LoanRepaymentHistoryVo record : records) {
-                String planDetailSid = record.getPlanDetailSid();
-                List<LoanRepaymentHistory> histories = baseMapper.selByPlanSid(planDetailSid);
-                BigDecimal returned = new BigDecimal(0);
-                if (!histories.isEmpty()) {
-                    for (LoanRepaymentHistory history : histories) {
-                        returned = history.getActualMoney().add(returned);
-                    }
-                }
-                LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchBySid(record.getPlanDetailSid());
-                if (null != loanRepaymentPlanDetails) {
-                    BigDecimal dueMoney = loanRepaymentPlanDetails.getDueMoney();
-                    BigDecimal subtract = dueMoney.subtract(returned);
-                    record.setOutstandingMoney(String.valueOf(subtract));
-                }
+        if (StringUtils.isNotBlank(pagerQuery.getChange())) {
+            if (pagerQuery.getChange().equals("1")) {
+                qw.apply("((SELECT l.vehCount FROM anrui_buscenter.bus_sales_order_loancontract as l WHERE l.loanContractNo = m.loanContractNo and l.isDelete = 0) > 1 and m.outstandingMoney != m.actualMoney and returnWay = '直还')");
             }
         }
+        qw.orderByDesc("m.dataTime");
+        IPage<LoanRepaymentHistoryVo> pagging = baseMapper.monthListPage(page, qw);
+//        List<LoanRepaymentHistoryVo> records = pagging.getRecords();
+//        records.removeAll(Collections.singleton(null));
+//        if (!records.isEmpty()) {
+//            for (LoanRepaymentHistoryVo record : records) {
+//                String planDetailSid = record.getPlanDetailSid();
+//                List<LoanRepaymentHistory> histories = baseMapper.selByPlanSid(planDetailSid);
+//                BigDecimal returned = new BigDecimal(0);
+//                if (!histories.isEmpty()) {
+//                    for (LoanRepaymentHistory history : histories) {
+//                        returned = history.getActualMoney().add(returned);
+//                    }
+//                }
+//                LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.fetchBySid(record.getPlanDetailSid());
+//                if (null != loanRepaymentPlanDetails) {
+//                    BigDecimal dueMoney = loanRepaymentPlanDetails.getDueMoney();
+//                    BigDecimal subtract = dueMoney.subtract(returned);
+//                    record.setOutstandingMoney(String.valueOf(subtract));
+//                }
+//            }
+//        }
         PagerVo<LoanRepaymentHistoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -704,10 +651,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return rb.success().setData(vo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         for (String sid : sids) {
             LoanRepaymentHistory repaymentHistory = fetchBySid(sid);
+            if (repaymentHistory.getReturnWay().equals("转付")) {
+                return rb.setMsg("转付记录无法删除");
+            }
             baseMapper.deleteById(repaymentHistory);
         }
         return rb.success().setMsg("删除成功");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.java

@@ -33,7 +33,7 @@ public interface LoanSubletApplyMapper extends BaseMapper<LoanSubletApply> {
 
     SubletVinList selReturnVinLegerBySid(@Param("ledgerSid") String ledgerSid);
 
-    SubletVinList selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid);
+    List<SubletVinList>  selReturnTrVinLegerByPSid(@Param("ledgerSid")String ledgerSid);
 
     SubletInitVo selLoanInfoByTrVeh(@Param("ledgerSid")String ledgerSid);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyMapper.xml

@@ -156,6 +156,7 @@
           and disposal = '未处置'
           and stockState = '库存'
     </select>
+
     <select id="selLoanInfoByTrVeh" resultType="com.yxt.anrui.riskcenter.api.loansubletapply.SubletInitVo">
         SELECT l.bankName,
                l.bankContractNo,
@@ -205,4 +206,5 @@
         FROM loan_return_veh_ledger
         WHERE sid = #{ledgerSid}
     </select>
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java

@@ -285,9 +285,11 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
                     if (null != mVeh) {
                         vinList.add(mVeh);
                     }
-                    SubletVinList tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid);
-                    if (null != tVeh) {
-                        vinList.add(tVeh);
+                    List<SubletVinList> tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid);
+                    if (!tVeh.isEmpty()) {
+                        tVeh.stream().forEach(t -> {
+                            vinList.add(t);
+                        });
                     }
                     vo.setVinList(vinList);
                 } else if (vehType.equals("挂车")) {
@@ -743,6 +745,9 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
         dto.setApplySid(subletApply.getSid());
         dto.setDisposalKey("04");
         dto.setDisposal("二次转租");
+        if (StringUtils.isNotBlank(subletApply.getVinOwner())) {
+            dto.setNewCustomer(subletApply.getVinOwner());
+        }
         List<SubletVinList> vinLists = loanSubletVehService.selByMainSid(subletApply.getSid());
         if (!vinLists.isEmpty()) {
             vinLists.forEach(v -> {
@@ -1063,6 +1068,9 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
             if (StringUtils.isNotBlank(entity.getBankContractNo())) {
                 vo.setBankContractNo(entity.getBankContractNo());
             }
+            if (StringUtils.isNotBlank(entity.getLoanContractNo())) {
+                vo.setLoanContractNo(entity.getLoanContractNo());
+            }
             if (StringUtils.isNotBlank(entity.getPlan())) {
                 vo.setPlan(entity.getPlan());
             }

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

@@ -371,7 +371,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             List<LoanTransferPaymentRecordVo> recordList = new ArrayList<>();
             if (!records.isEmpty()) {
                 for (LoanTransferPaymentRecord record : records) {
-                  //  String historySid = record.getRepaymentHistorySid();
+                    //  String historySid = record.getRepaymentHistorySid();
                     LoanTransferPaymentRecordVo recordVo = baseMapper.paymentDetails(record.getSid());
                     recordList.add(recordVo);
                 }
@@ -752,7 +752,15 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                                         payDto.setReceiveCompany(paymentRecord.getAccount());
                                     }
                                 }
-                                finPaymentrecordFeign.save(payDto);
+                                String paySid = finPaymentrecordFeign.saveReturnSid(payDto).getData();
+                                if (StringUtils.isNotBlank(paySid)) {
+                                    if (!collect.isEmpty()) {
+                                        collect.stream().forEach(c -> {
+                                            c.setPaySid(paySid);
+                                            loanTransferPaymentRecordService.updateById(c);
+                                        });
+                                    }
+                                }
                             }
                         }
                     }