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

优化收款推凭证、消减垫款应收

master
fanzongzhe 1 year ago
parent
84ae38e981
commit
958b291258
4 changed files with 95 additions and 37 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. 65
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
  3. 43
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
  4. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

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

@ -3786,16 +3786,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (v.getReceivablesName().equals("月还")) {
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
String orderSid = planDetails.getSalesOrderSid();
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
String orderSid = planDetails.getSalesOrderSid();
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
if (loanFinBank.getReAdvances() == 1) {
FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
jr.setCreateBySid(userSid);
@ -3823,11 +3823,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (v.getReceivablesName().equals("资方逾期利息")) {
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
String orderSid = planDetails.getSalesOrderSid();
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
@ -3836,6 +3831,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
String orderSid = planDetails.getSalesOrderSid();
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
if (loanFinBank.getReAdvances() == 1) {
FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
jr.setCreateBySid(userSid);
@ -3893,19 +3893,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
stringList.removeAll(Collections.singleton(null));
BigDecimal a3 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
a3 = baseMapper.selectA3(stringList);
}
unall = unall.add(a1).add(a3);
List<String> unList = baseMapper.selectUnA(busVinSid);
unList.removeAll(Collections.singleton(null));
BigDecimal a4 = BigDecimal.ZERO;
if(!unList.isEmpty()){
if (!unList.isEmpty()) {
//已收
a4 = baseMapper.selectA4(unList);
}
BigDecimal a5 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
a5 = baseMapper.selectA5(stringList);
}
@ -3919,7 +3919,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
stringList.removeAll(Collections.singleton(null));
BigDecimal a3 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
a3 = baseMapper.selectA3(stringList);
}
BigDecimal a1 = baseMapper.selectA1(busVinSid);
@ -3928,12 +3928,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//已收
unList.removeAll(Collections.singleton(null));
BigDecimal a4 = BigDecimal.ZERO;
if(!unList.isEmpty()){
if (!unList.isEmpty()) {
//已收
a4 = baseMapper.selectA4(unList);
}
BigDecimal a5 = BigDecimal.ZERO;
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
a5 = baseMapper.selectA5(stringList);
}
yAll = yAll.add(a4).add(a5);
@ -4317,23 +4317,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherDetail.setCustomerCode(customerNumber);
voucherDetail.setCustomerName(customerName);
}
if (v.getReceivablesName().equals("资方逾期利息")) {
//间还已逾期
if (null !=planDetails.getOweState()){
if (planDetails.getOweState() == 0) {
voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
} else {
LoanRepaymentPlanDetailsForOverDue checkOverdue = loanRepaymentPlanDetailsFeign.checkOverDue(planSid).getData();
if (checkOverdue != null) {
if (StringUtils.isNotBlank(checkOverdue.getOverdueState())) {
if (checkOverdue.getOverdueState().equals("0")) {
//间还已逾期
voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
} else if (checkOverdue.getOverdueState().equals("1")) {
//间还未逾期
} else if (planDetails.getOweState() == 1) {
voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER1.getCode());
}
}
}
}
// if (v.getReceivablesName().equals("资方逾期利息")) {
// //间还已逾期
// voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
// } else {
// LoanRepaymentPlanDetailsForOverDue checkOverdue = loanRepaymentPlanDetailsFeign.checkOverDue(planSid).getData();
// if (checkOverdue != null) {
// if (StringUtils.isNotBlank(checkOverdue.getOverdueState())) {
// if (checkOverdue.getOverdueState().equals("0")) {
// //间还已逾期
// voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
// } else if (checkOverdue.getOverdueState().equals("1")) {
// //间还未逾期
// voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER1.getCode());
// }
// }
// }
// }
try {
voucherDetail.setDataTime(sdf.parse(finCollectionConfirmation.getCollectionDate()));
} catch (ParseException e) {

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

@ -63,4 +63,8 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
List<String> selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid);
String selPayStateByPlanSid(@Param("key") String key);
List<String> selSidsForBuckle(@Param("useOrgSid") String useOrgSid);
int setBuckleState(@Param("sids")List<String> sids,@Param("buckleKey") String buckleKey,@Param("buckle") String buckle);
}

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

@ -9,7 +9,15 @@
#{sid}
</foreach>
</update>
<update id="setBuckleState">
update loan_repayment_history
set buckleKey = #{buckleKey},
buckle =#{buckle}
where sid in
<foreach item="sid" collection="sids" open="(" separator="," close=")">
#{sid}
</foreach>
</update>
<select id="updateRecordInfo"
@ -556,5 +564,38 @@
h.updateTime DESC
LIMIT 1
</select>
<select id="selSidsForBuckle" resultType="java.lang.String">
SELECT DISTINCT
b.sid
FROM
(
SELECT
his.*,
a.*
FROM
loan_repayment_history AS his
LEFT JOIN loan_repayment_plan_details as p ON his.planDetailSid = p.sid
LEFT JOIN (
SELECT
h.planDetailSid AS ppp,
IFNULL( SUM( h.actualMoney ), 0 ) AS sumActualMoney
FROM
loan_repayment_history AS h
WHERE
buckleKey != '002'
AND buckleKey != '003'
AND updateState = 1
GROUP BY
h.planDetailSid
) a ON his.planDetailSid = a.ppp
WHERE
his.buckleKey != '002'
AND his.buckleKey != '003'
AND his.updateState = 1
AND p.useOrgSid = #{useOrgSid}
) AS b
WHERE
sumActualMoney = 0
</select>
</mapper>

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

@ -802,8 +802,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
}
}
} else {
return rb.setMsg("暂无可更新的还款记录");
}
//直还+转付余额为零的设置默认划扣状态已通过
List<String> hisSidsForBuckle = baseMapper.selSidsForBuckle(pushUseOrgSid);
if (!hisSidsForBuckle.isEmpty()) {
int i = baseMapper.setBuckleState(hisSidsForBuckle,"003","审核通过");
}
if (histories.isEmpty() && hisSidsForBuckle.isEmpty()) {
return rb.setMsg("暂无可更新的数据");
}
return rb.success();
}

Write Preview
Loading…
Cancel
Save