yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

zhanglei
ligaode 6 days ago
parent
9fbaa0cdaf
commit
555a61f562
7 changed files with 159 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java
  2. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml
  3. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
  5. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
  6. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
  7. 112
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java
View File

@ -77,5 +77,5 @@ public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVe
@Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{applySid} and bankContractNo = #{busSid}")
List<LoanBePadsincereVehDetailsVo> selByBankCont(@Param("applySid") String applySid, @Param("busSid") String busSid);
BigDecimal selByBusVinSid(String busVinSid);
List<LoanBePadsincereVehDetailsVo> selByBusVinSid(String busVinSid);
}

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml
View File

@ -20,11 +20,14 @@
and paySid = #{paySid}
</select>
<select id="selByBusVinSid" resultType="java.math.BigDecimal">
<select id="selByBusVinSid"
resultType="com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo">
SELECT
IF(SUM(padMoney), SUM(padMoney), 0)
IF(SUM(padMoney), SUM(padMoney), 0) AS padMoney,
period
FROM
loan_be_padsincere_veh
WHERE saleVehSid = #{busVinSid}
GROUP BY period
</select>
</mapper>

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java
View File

@ -116,7 +116,7 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
return baseMapper.selByBankCont(applySid, busSid);
}
public BigDecimal selByBusVinSid(String busVinSid) {
public List<LoanBePadsincereVehDetailsVo> selByBusVinSid(String busVinSid) {
return baseMapper.selByBusVinSid(busVinSid);
}
}

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

@ -89,4 +89,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
IPage<RepaymentStatisticsVo> repaymentStatistics2(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
List<RepaymentStatisticsVo> repaymentStatisticsList(@Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
List<LoanRepaymentHistory> selHistoryByPlanSids(@Param("jhmxSids") List<String> jhmxSids);
}

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

@ -1121,4 +1121,18 @@
${ew.sqlSegment}
</where>
</select>
<select id="selHistoryByPlanSids"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory">
SELECT
*
FROM
loan_repayment_history
<if test="jhmxSids != null and jhmxSids.size() != 0">
WHERE planDetailSid IN
<foreach collection="jhmxSids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

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

@ -2422,4 +2422,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
public List<LoanRepaymentHistory> selHistoryByPlanSids(List<String> jhmxSids) {
return baseMapper.selHistoryByPlanSids(jhmxSids);
}
}

112
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
View File

@ -65,8 +65,10 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
@ -81,6 +83,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN
import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
@ -173,6 +176,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
@Autowired
private LoanBePadsincereVehService loanBePadsincereVehService;
@Autowired
private LoanRepaymentHistoryService loanRepaymentHistoryService;
public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
LoanSecondarySalesNotApplyQuery query = pq.getParams();
@ -638,7 +643,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
//查询车辆还款计划明细
List<LoanRepaymentPlanDetails> loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selectByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
//查询车辆是否有垫款金额
BigDecimal dkje = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
//获取明细sid集合
List<String> jhmxSids = loanRepaymentPlanDetails.stream().map(c -> c.getSid()).
collect(Collectors.toList());
@ -695,6 +700,111 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
}
}
}
//月还
List<LoanRepaymentHistory> loanRepaymentHistories = loanRepaymentHistoryService.selHistoryByPlanSids(jhmxSids);
if (loanRepaymentHistories.isEmpty()) {
for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney());
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
} else {
for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) {
List<LoanRepaymentHistory> loanRepaymentHistories1 = loanRepaymentHistoryService.selHistoryByPlanSid(plan.getSid());
BigDecimal sh = loanRepaymentHistories1.stream().map(LoanRepaymentHistory::getActualMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
if (!loanBePadsincereVehDetailsVos.isEmpty()) {
List<String> periods = loanBePadsincereVehDetailsVos.stream().map(v -> v.getPeriod()).collect(Collectors.toList());
if (periods.contains(plan.getPeriod())) {
for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
if (plan.getPeriod().equals(loanBePadsincereVehDetailsVo.getPeriod())) {
sh = sh.subtract(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney()));
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}
} else {
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}else {
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}
}
}
}

Write Preview
Loading…
Cancel
Save