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 <= 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 <= 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 @@
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 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