From 936177d439f538039ecd7620460254c1453b2cae Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 30 Apr 2025 09:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E5=9B=9E=E5=85=A5=E5=BA=93=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E8=B0=83=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentPlanDetailsMapper.xml        | 16 ++--
 .../LoanReturnInboundApplyRest.java           | 11 +++
 .../LoanReturnInboundApplyService.java        | 82 +++++++++++--------
 3 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 3c4eb5d67e..2c71b7be30 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -956,7 +956,7 @@
         LEFT JOIN loan_repayment_history lrh
         ON lrh.planDetailSid = lrpd.sid
         WHERE lrpd.dueDate  &lt;= lrpd.updateTime
-        AND lrpd.busVinSid = #{saleVehSid} and lrh.updateState = '1'
+        AND lrpd.busVinSid = #{busVinSid}
         AND lrpd.oweState = 0  -- 只筛选已累欠（oweState = 0）
         GROUP BY lrpd.sid
         ) ss
@@ -965,7 +965,7 @@
         saleVehSid,
         SUM(bankBeInter) AS bankBeInter_sum
         FROM loan_be_padsincere_veh
-        WHERE saleVehSid = #{saleVehSid}
+        WHERE saleVehSid = #{busVinSid}
         GROUP BY saleVehSid
         ) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
         LEFT JOIN (
@@ -993,7 +993,7 @@
         LEFT JOIN loan_repayment_plan_details lp
         ON lp.sid = fjj.busSid
         WHERE lp.dueDate  &lt;= lp.updateTime
-        AND lp.busVinSid = #{saleVehSid}
+        AND lp.busVinSid = #{busVinSid}
         ) a
         GROUP BY a.busVinSid
         ) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
@@ -1001,14 +1001,18 @@
     </select>
 
     <select id="getBj" resultType="java.lang.String">
+        select sum(ss.yq_total) from (
         SELECT
+        lrpd.sid,
+        lrpd.busVinSid,
         (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total
         FROM loan_repayment_plan_details lrpd
         LEFT JOIN loan_repayment_history lrh
         ON lrh.planDetailSid = lrpd.sid
-        WHERE lrpd.dueDate  &lt;= lrpd.updateTime  -- 到期日已过
-        AND lrpd.busVinSid = #{busVinSid}
-        AND lrpd.oweState = 1 and lrh.updateState = '1'
+        WHERE lrpd.dueDate  &lt;= lrpd.updateTime
+        AND lrpd.busVinSid =#{busVinSid}
+        AND lrpd.oweState = '1'
+        GROUP BY lrpd.sid)ss
 
     </select>
 </mapper>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java
index 3b23e5a635..f2d0abcb77 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyRest.java
@@ -8,7 +8,10 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -103,4 +106,12 @@ public class LoanReturnInboundApplyRest implements LoanReturnInboundApplyFeign {
     public ResultBean<ReturnAppVo> getDetailsApp(String sid) {
         return loanReturnInboundApplyService.getDetailsApp(sid);
     }
+    @ApiOperation(value = "财务推送扣回入库凭证测试")
+    @PostMapping(value = "/pushRiskToFin")
+    public ResultBean pushRiskToFin(String sid){
+        LoanReturnInboundApply loanReturnInboundApply = loanReturnInboundApplyService.fetchBySid(sid);
+        loanReturnInboundApplyService.pushRiskToFin(loanReturnInboundApply);
+        return ResultBean.fireSuccess();
+
+    }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
index 8bb58eea5c..d2be606dc6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
@@ -718,43 +718,57 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
 
         //-------------------------------------------应收贷款车欠款_待处理欠款_扣回车辆
-        voucherResultDetailDtoJf.setSummary("扣回车辆入库");
-        voucherResultDetailDtoJf.setSubjectNo("1201.03.01");
-        //核算部门
-        voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
-        //核算客户
-        voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-        voucherResultDetailDtoJf.setDebit(all.toString());
-        voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+        if(all.compareTo(BigDecimal.ZERO) != 0){
+            voucherResultDetailDtoJf.setSummary("扣回车辆入库");
+            voucherResultDetailDtoJf.setSubjectNo("1201.03.01");
+            //核算部门
+            voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+            //核算客户
+            voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+            voucherResultDetailDtoJf.setDebit(all.toString());
+            voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+        }
+
         //---------------------------------------------应收贷款车欠款_到期欠款_累欠
-        voucherResultDetailDtoDf1.setSummary("扣回车辆入库");
-        voucherResultDetailDtoDf1.setSubjectNo("1201.02.03");
-        //核算部门
-        voucherResultDetailDtoDf1.setDimensionDept(deptVo.getOrgCode());
-        //核算客户
-        voucherResultDetailDtoDf1.setDimensionCustom(customerNumber);
-        voucherResultDetailDtoDf1.setCredit(lqMoney.toString());
-        voucherResultDetailDtos.add(voucherResultDetailDtoDf1);
+        if(lqMoney.compareTo(BigDecimal.ZERO) != 0){
+            voucherResultDetailDtoDf1.setSummary("扣回车辆入库");
+            voucherResultDetailDtoDf1.setSubjectNo("1201.02.03");
+            //核算部门
+            voucherResultDetailDtoDf1.setDimensionDept(deptVo.getOrgCode());
+            //核算客户
+            voucherResultDetailDtoDf1.setDimensionCustom(customerNumber);
+            voucherResultDetailDtoDf1.setCredit(lqMoney.toString());
+            voucherResultDetailDtos.add(voucherResultDetailDtoDf1);
+        }
+
         //--------------------------------------------应收贷款车欠款_未到期欠款_未到期欠款
-        voucherResultDetailDtoDf2.setSummary("扣回车辆入库");
-        voucherResultDetailDtoDf2.setSubjectNo("1201.01.00");
-        //核算部门
-        voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
-        //核算客户
-        voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
-        voucherResultDetailDtoDf2.setCredit(wdqMoney.toString());
-        voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
+        if(wdqMoney.compareTo(BigDecimal.ZERO) != 0){
+            voucherResultDetailDtoDf2.setSummary("扣回车辆入库");
+            voucherResultDetailDtoDf2.setSubjectNo("1201.01.00");
+            //核算部门
+            voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
+            //核算客户
+            voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
+            voucherResultDetailDtoDf2.setCredit(wdqMoney.toString());
+            voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
+        }
+
         //-------------------------------------------应收贷款车欠款_到期欠款_本金
-        voucherResultDetailDtoDf3.setSummary("扣回车辆入库");
-        voucherResultDetailDtoDf3.setSubjectNo("1201.02.01");
-        //核算部门
-        voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
-        //核算客户
-        voucherResultDetailDtoDf3.setDimensionCustom(customerNumber);
-        voucherResultDetailDtoDf3.setCredit(bjMoney.toString());
-        voucherResultDetailDtos.add(voucherResultDetailDtoDf3);
-        voucher.setResultDetails(voucherResultDetailDtos);
-        finKingDeeFeign.saveVoucher(voucher);
+        if(bjMoney.compareTo(BigDecimal.ZERO) != 0){
+            voucherResultDetailDtoDf3.setSummary("扣回车辆入库");
+            voucherResultDetailDtoDf3.setSubjectNo("1201.02.01");
+            //核算部门
+            voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
+            //核算客户
+            voucherResultDetailDtoDf3.setDimensionCustom(customerNumber);
+            voucherResultDetailDtoDf3.setCredit(bjMoney.toString());
+            voucherResultDetailDtos.add(voucherResultDetailDtoDf3);
+        }
+        if(!voucherResultDetailDtos.isEmpty()){
+            voucher.setResultDetails(voucherResultDetailDtos);
+            finKingDeeFeign.saveVoucher(voucher);
+        }
+
     }
 
     private int submitBusinessData(SubmitReturnInbondApplyDto dto, LoanReturnInboundApply loanReturnInboundApply) {