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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 weeks ago
parent
2a0de92028 a86dc424b5
commit
d2aacf8faf
20 changed files with 1601 additions and 942 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java
  2. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  3. 325
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  4. 10
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
  5. 23
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java
  6. 25
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
  7. 19
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
  8. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyMapper.java
  9. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyMapper.xml
  10. 379
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
  11. 36
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
  12. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java
  13. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.xml
  14. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java
  15. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
  16. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
  17. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  18. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java
  19. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java
View File

@ -93,7 +93,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
private String vehMark; private String vehMark;
@ApiModelProperty("结清申请提交时间") @ApiModelProperty("结清申请提交时间")
private Date settleApplyDate; private Date settleApplyDate;
//风控状态（0正常，1交回，2赎回，3转租，4不追偿，5处置损失，6亏损立案，7亏损执行，8亏损结案、9赎回中，10 二次销售中、11转租中） //风控状态（0正常，1交回，2赎回，3转租，4赎回中、5二次销售中、6转租中、7处置损失、8不追偿、9未交回立案、10交回立案、11亏损立案、12执行、13诉讼结案、14执行结案）
@ApiModelProperty("风控状态") @ApiModelProperty("风控状态")
private Integer riskState; private Integer riskState;
//是否生成资金占用费（1生成,0不生成.默认生成，交回后改为不生成，若赎回改为生成） //是否生成资金占用费（1生成,0不生成.默认生成，交回后改为不生成，若赎回改为生成）

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
View File

@ -202,5 +202,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
public ResultBean setFundState(BusVinStateSetQuery busVinStateSetQuery) { public ResultBean setFundState(BusVinStateSetQuery busVinStateSetQuery) {
return null; return null;
} }
} }

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

@ -4726,10 +4726,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list3 = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> list3 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list4 = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> list4 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list5 = new ArrayList<>();
BigDecimal all = BigDecimal.ZERO;//赎回 BigDecimal all = BigDecimal.ZERO;//赎回
BigDecimal all2 = BigDecimal.ZERO;//二次销售 BigDecimal all2 = BigDecimal.ZERO;//二次销售
BigDecimal all3 = BigDecimal.ZERO;//亏损立案 BigDecimal all3 = BigDecimal.ZERO;//亏损立案
BigDecimal all4 = BigDecimal.ZERO;//亏损立案 BigDecimal all4 = BigDecimal.ZERO;//未交回立案
BigDecimal all5 = BigDecimal.ZERO;//执行
BigDecimal otherMoney = BigDecimal.ZERO; BigDecimal otherMoney = BigDecimal.ZERO;
String payType = ""; String payType = "";
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData(); DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData();
@ -4796,11 +4798,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} else { } else {
customerNumber = busSalesOrderVehicle.getTemporaryNo(); customerNumber = busSalesOrderVehicle.getTemporaryNo();
} }
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中 if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用） ////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用）
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
if ("收回车辆费用".equals(v.getReceivablesName())) { if ("收回车辆费用".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoJf2.setSummary("收款-赎回费用"); voucherResultDetailDtoJf2.setSummary("收款-赎回费用");
voucherResultDetailDtoJf2.setSubjectNo("6601.32.05"); voucherResultDetailDtoJf2.setSubjectNo("6601.32.05");
@ -4813,8 +4815,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
//预提费用 待确认逾期利息 待确认途期利息--资金占用费转收入 //预提费用 待确认逾期利息 待确认途期利息--资金占用费转收入
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
if ("资金占用费".equals(v.getReceivablesName())) {//借方 if ("资金占用费".equals(v.getReceivablesName())) {//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf3.setSummary("资金占用费转收入"); voucherResultDetailDtoJf3.setSummary("资金占用费转收入");
voucherResultDetailDtoJf3.setSubjectNo("2191.05.00"); voucherResultDetailDtoJf3.setSubjectNo("2191.05.00");
//核算部门 //核算部门
@ -4825,8 +4827,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list.add(voucherResultDetailDtoJf3); list.add(voucherResultDetailDtoJf3);
} }
//资金占用费转收入--其他业务收入_消贷收入_消贷利息 //资金占用费转收入--其他业务收入_消贷收入_消贷利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
if ("资金占用费".equals(v.getReceivablesName())) {//贷方 if ("资金占用费".equals(v.getReceivablesName())) {//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf3.setSummary("资金占用费转收入"); voucherResultDetailDtoDf3.setSummary("资金占用费转收入");
voucherResultDetailDtoDf3.setSubjectNo("6002.01.17"); voucherResultDetailDtoDf3.setSubjectNo("6002.01.17");
//核算部门 //核算部门
@ -4837,10 +4839,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list.add(voucherResultDetailDtoDf3); list.add(voucherResultDetailDtoDf3);
} }
//应收贷款车欠款_待处理欠款_扣回车辆--月还/资方逾期利息 //应收贷款车欠款_待处理欠款_扣回车辆--月还/资方逾期利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){
voucherResultDetailDtoDf.setSummary("收款-赎回款"); voucherResultDetailDtoDf.setSummary("收款-赎回款");
}else{ }else{
voucherResultDetailDtoDf.setSummary("收款-转租款"); voucherResultDetailDtoDf.setSummary("收款-转租款");
@ -5026,12 +5028,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
//应收贷款车欠款_到期欠款_逾期利息--资金占用费 //应收贷款车欠款_到期欠款_逾期利息--资金占用费
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
if ("资金占用费".equals(v.getReceivablesName())) { if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){
voucherResultDetailDtoDf2.setSummary("收款-赎回款"); voucherResultDetailDtoDf2.setSummary("收款-赎回款");
}else{ }else{
voucherResultDetailDtoDf2.setSummary("收款-转租款"); voucherResultDetailDtoDf2.setSummary("收款-转租款");
@ -5045,7 +5046,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list.add(voucherResultDetailDtoDf2); list.add(voucherResultDetailDtoDf2);
} }
} else if ("10".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证 } else if ("5".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
@ -5274,7 +5275,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
) { ) {
otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney())); otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney()));
} }
}else if("6".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案 }else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){ if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all3 = all3.add(new BigDecimal(v.getSubscriptionMoney())); all3 = all3.add(new BigDecimal(v.getSubscriptionMoney()));
@ -5508,11 +5509,197 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损执行 }else if("9".equals(busSalesOrderVehicle.getRiskState().toString())){//未交回立案
//---------应收贷款车欠款_待处理欠款_诉讼车辆
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款");
voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf);
if("月还".equals(v.getReceivablesName())){
//推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
historyEntity.setPlanDetailSid(planSid);
historyEntity.setScheduleSid(planDetails.getScheduleSid());
historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
historyEntity.setUpdateTime(new DateTime());
historyEntity.setUpdateState("1");
historyEntity.setDataTime(new DateTime());
historyEntity.setBuckle("审核通过");
historyEntity.setBuckleKey("003");
historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
historyEntity.setReturnWay("间还");
historyEntity.setReturnWayKey("02");
if (null != planDetails.getPaymentMoney()) {
if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
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();
String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
String bankSid = "";
String scheduleSid = planDetails.getScheduleSid();
LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
if (isOther.equals("0")) {
if (StringUtils.isNotBlank(schedule.getBankSid())) {
bankSid = schedule.getBankSid();
}
} else if (isOther.equals("1")) {
if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
bankSid = schedule.getOtherBankSid();
}
}
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
if (loanFinBank.getReAdvances() == 1) {
try {
Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
historyEntity.setActualDate(collDate);
if (planDetails.getDueDate().compareTo(collDate) > 0) {
//未逾期
Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
cal_1.setTime(planDetails.getDueDate());
cal_1.add(Calendar.DAY_OF_MONTH, -1);
historyEntity.setPrepareDate(cal_1.getTime());
} else {
//已逾期
historyEntity.setPrepareDate(new DateTime());
}
} catch (ParseException e) {
e.printStackTrace();
}
historyEntity.setPaymentState("待转付");
historyEntity.setPaymentStateKey("001");
FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
jr.setCreateBySid(userSid);
SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
jr.setCreateByName(userVo.getName());
jr.setBusSid(planSid);
jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
jr.setPayCostTitleKey("007");
jr.setPayCostTitleValue("资方退还垫款");
jr.setOrgSidPath(planDetails.getOrgSidPath());
jr.setUseOrgName(planDetails.getUseOrgName());
jr.setUseOrgSid(planDetails.getUseOrgSid());
jr.setStaffDeptName(planDetails.getDept());
jr.setStaffName(planDetails.getStaffName());
jr.setStaffDeptSid(planDetails.getDeptSid());
jr.setStaffUserSid(planDetails.getSalesUserSid());
finUncollectedReceivablesDetailedJRService.insert(jr);
}
}
}
} else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
try {
Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
historyEntity.setActualDate(collDate);
if (planDetails.getDueDate().compareTo(collDate) > 0) {
//未逾期
Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
cal_1.setTime(planDetails.getDueDate());
cal_1.add(Calendar.DAY_OF_MONTH, -1);
historyEntity.setPrepareDate(cal_1.getTime());
} else {
//已逾期
historyEntity.setPrepareDate(new DateTime());
}
} catch (ParseException e) {
e.printStackTrace();
}
historyEntity.setPaymentState("待转付");
historyEntity.setPaymentStateKey("001");
}
} else {
try {
Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
historyEntity.setActualDate(collDate);
if (planDetails.getDueDate().compareTo(collDate) > 0) {
//未逾期
Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
cal_1.setTime(planDetails.getDueDate());
cal_1.add(Calendar.DAY_OF_MONTH, -1);
historyEntity.setPrepareDate(cal_1.getTime());
} else {
//已逾期
historyEntity.setPrepareDate(new DateTime());
}
} catch (ParseException e) {
e.printStackTrace();
}
historyEntity.setPaymentState("待转付");
historyEntity.setPaymentStateKey("001");
}
loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
}else{
if (null != planDetails.getPaymentInterest()) {
if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal paymentInterest = planDetails.getPaymentInterest();
String subscriptionMoney = v.getSubscriptionMoney();
BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentInterest(subtract);
BigDecimal paymentMoney = planDetails.getPaymentMoney();
BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
planDetails.setPaymentMoney(subtract2);
loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
String orderSid = planDetails.getSalesOrderSid();
String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
String bankSid = "";
String scheduleSid = planDetails.getScheduleSid();
LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
if (isOther.equals("0")) {
if (StringUtils.isNotBlank(schedule.getBankSid())) {
bankSid = schedule.getBankSid();
}
} else if (isOther.equals("1")) {
if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
bankSid = schedule.getOtherBankSid();
}
}
ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
if (bankResultBean.getData() != null) {
LoanFinBank loanFinBank = bankResultBean.getData();
if (null != loanFinBank.getReAdvances()) {
if (loanFinBank.getReAdvances() == 1) {
FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
jr.setCreateBySid(userSid);
SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
jr.setCreateByName(userVo.getName());
jr.setBusSid(planSid);
jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
jr.setPayCostTitleKey("007");
jr.setPayCostTitleValue("资方退还垫款");
jr.setOrgSidPath(planDetails.getOrgSidPath());
jr.setUseOrgName(planDetails.getUseOrgName());
jr.setUseOrgSid(planDetails.getUseOrgSid());
jr.setStaffDeptName(planDetails.getDept());
jr.setStaffName(planDetails.getStaffName());
jr.setStaffDeptSid(planDetails.getDeptSid());
jr.setStaffUserSid(planDetails.getSalesUserSid());
finUncollectedReceivablesDetailedJRService.insert(jr);
}
}
}
}
}
}
}
//---------预提费用_诉讼保全费
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){ if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney())); all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款诉讼费"); voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款诉讼费");
voucherResultDetailDtoDf.setSubjectNo("2191.25"); voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门 //核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -5520,12 +5707,28 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf); list4.add(voucherResultDetailDtoDf);
}
//---------营业费用_催收费用 评估费/律师费
if("律师费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
all4 = all4.subtract(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoJf.setSummary(customerNumber+"诉讼回款-律师费");
voucherResultDetailDtoJf.setSubjectNo("6601.32.06");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(new BigDecimal(v.getSubscriptionMoney()).negate().toString());
list4.add(voucherResultDetailDtoJf);
} }
//--------应收贷款车欠款_到期欠款_逾期利息-资金占用费
if ("资金占用费".equals(v.getReceivablesName())) { if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney())); all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary(customerNumber+"执行回款-资金占用费"); voucherResultDetailDtoDf2.setSummary(customerNumber+"诉讼回款资金占用费");
voucherResultDetailDtoDf2.setSubjectNo("1201.02.02"); voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
//核算部门 //核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
@ -5554,10 +5757,72 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDfZjzyf); list4.add(voucherResultDetailDtoDfZjzyf);
} }
}else if("12".equals(busSalesOrderVehicle.getRiskState().toString())){//执行
if("诉讼保全费".equals(v.getReceivablesName()) || "诉讼费用".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all5 = all5.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款诉讼费");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list5.add(voucherResultDetailDtoDf);
}
if("律师费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
all5 = all5.subtract(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoJf.setSummary(customerNumber+"执行回款-律师费");
voucherResultDetailDtoJf.setSubjectNo("6601.32.06");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(new BigDecimal(v.getSubscriptionMoney()).negate().toString());
list5.add(voucherResultDetailDtoJf);
}
if("资金占用费".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all5 = all5.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary(customerNumber+"执行回款-资金占用费");
voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
list5.add(voucherResultDetailDtoDf2);
//------------------------资金占用费转收入
Voucher.VoucherResultDetailDto voucherResultDetailDtoJfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoJfZjzyf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoJfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJfZjzyf.setDebit(v.getSubscriptionMoney());
list5.add(voucherResultDetailDtoJfZjzyf);
//资金占用费转收入--其他业务收入_消贷收入_消贷利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDfZjzyf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDfZjzyf.setSummary("资金占用费转收入");
voucherResultDetailDtoDfZjzyf.setSubjectNo("6002.01.19");
//核算部门
voucherResultDetailDtoDfZjzyf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDfZjzyf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
list5.add(voucherResultDetailDtoDfZjzyf);
}
//ToDo:多收款转收入 //ToDo:多收款转收入
if("其他收入".equals(v.getReceivablesName())){ if("其他收入".equals(v.getReceivablesName())){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney())); all5 = all5.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary("多收款转收入"); voucherResultDetailDtoDf.setSummary("多收款转收入");
voucherResultDetailDtoDf.setSubjectNo("6002.01.21"); voucherResultDetailDtoDf.setSubjectNo("6002.01.21");
//核算部门 //核算部门
@ -5565,13 +5830,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//核算客户 //核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf); list5.add(voucherResultDetailDtoDf);
} }
//TodO:应收贷款车欠款_待处理欠款_待执行 //TodO:应收贷款车欠款_待处理欠款_待执行
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all4 = all4.add(new BigDecimal(v.getSubscriptionMoney())); all5 = all5.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款"); voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款");
voucherResultDetailDtoDf.setSubjectNo("1201.03.05"); voucherResultDetailDtoDf.setSubjectNo("1201.03.05");
//核算部门 //核算部门
@ -5579,7 +5844,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//核算客户 //核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber); voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
list4.add(voucherResultDetailDtoDf); list5.add(voucherResultDetailDtoDf);
if("月还".equals(v.getReceivablesName())){ if("月还".equals(v.getReceivablesName())){
//推送间还认款记录 //推送间还认款记录
LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@ -5753,7 +6018,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
} }
} }
@ -5810,10 +6074,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
voucherResultDetailDtoJf.setSubjectNo(payType); voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）"); voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
voucherResultDetailDtoJf.setDebit(String.valueOf(all3)); voucherResultDetailDtoJf.setDebit(String.valueOf(all4));
list4.add(voucherResultDetailDtoJf); list4.add(voucherResultDetailDtoJf);
} }
if (all5.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
}
voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
voucherResultDetailDtoJf.setDebit(String.valueOf(all5));
list5.add(voucherResultDetailDtoJf);
}
if (!list.isEmpty()) {//赎回收款（风控状态赎回中以及交回推送） if (!list.isEmpty()) {//赎回收款（风控状态赎回中以及交回推送）
voucher.setResultDetails(list); voucher.setResultDetails(list);
@ -5828,10 +6103,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finKingDeeFeignRest.saveVoucher(voucher); finKingDeeFeignRest.saveVoucher(voucher);
} }
if(!list4.isEmpty()){//执行后法院认款 if(!list4.isEmpty()){//未交回诉讼后法院认款
voucher.setResultDetails(list4); voucher.setResultDetails(list4);
finKingDeeFeignRest.saveVoucher(voucher); finKingDeeFeignRest.saveVoucher(voucher);
} }
if(!list5.isEmpty()){//执行后法院认款
voucher.setResultDetails(list5);
finKingDeeFeignRest.saveVoucher(voucher);
}
} }
//名义价其他费用推财务 //名义价其他费用推财务

10
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApply.java
View File

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* Project: anrui-riskcenter(案件执行立案申请) <br/> * Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApply.java <br/> * File: LoanCaseExecuteApply.java <br/>
@ -108,6 +110,14 @@ public class LoanCaseExecuteApply extends BaseEntity {
private String executeDeadline; // 执行时限 private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额") @ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额 private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("当前欠款金额")
private BigDecimal amountInArear;
@ApiModelProperty("其中执行欠款金额")
private BigDecimal executeAmountInArear;
@ApiModelProperty("其中执行费用金额")
private BigDecimal executeExpenseAmount;
@ApiModelProperty("预计申请还账金额")
private BigDecimal badDebtAmount;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")

23
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDetailsVo.java
View File

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
@ -35,23 +34,11 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
* Description: 案件执行立案申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件执行立案申请 视图数据详情", description = "案件执行立案申请 视图数据详情") @ApiModel(value = "案件执行立案申请 视图数据详情", description = "案件执行立案申请 视图数据详情")
public class LoanCaseExecuteApplyDetailsVo implements Vo { public class LoanCaseExecuteApplyDetailsVo implements Vo {
@ -123,6 +110,14 @@ public class LoanCaseExecuteApplyDetailsVo implements Vo {
private String executeDeadline; // 执行时限 private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额") @ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额 private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("当前欠款金额")
private String amountInArear;
@ApiModelProperty("其中执行欠款金额")
private String executeAmountInArear;
@ApiModelProperty("其中执行费用金额")
private String executeExpenseAmount;
@ApiModelProperty("预计申请还账金额")
private String badDebtAmount;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")

25
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyDto.java
View File

@ -25,9 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDto;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
@ -35,21 +32,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto <br/>
* Description: 案件执行立案申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件执行立案申请 数据传输对象", description = "案件执行立案申请 数据传输对象") @ApiModel(value = "案件执行立案申请 数据传输对象", description = "案件执行立案申请 数据传输对象")
public class LoanCaseExecuteApplyDto implements Dto { public class LoanCaseExecuteApplyDto implements Dto {
@ -118,6 +103,14 @@ public class LoanCaseExecuteApplyDto implements Dto {
private String executeDeadline; // 执行时限 private String executeDeadline; // 执行时限
@ApiModelProperty("执行立案金额") @ApiModelProperty("执行立案金额")
private String executeRegisMoney; // 执行立案金额 private String executeRegisMoney; // 执行立案金额
@ApiModelProperty("当前欠款金额")
private BigDecimal amountInArear;
@ApiModelProperty("其中执行欠款金额")
private BigDecimal executeAmountInArear;
@ApiModelProperty("其中执行费用金额")
private BigDecimal executeExpenseAmount;
@ApiModelProperty("预计申请还账金额")
private BigDecimal badDebtAmount;
@ApiModelProperty("案件进程sid") @ApiModelProperty("案件进程sid")
private String busSid; private String busSid;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")

19
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseexecuteapply/LoanCaseExecuteApplyVo.java
View File

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.riskcenter.api.loancaseexecuteapply; package com.yxt.anrui.riskcenter.api.loancaseexecuteapply;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
@ -33,21 +32,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo <br/>
* Description: 案件执行立案申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data @Data
@ApiModel(value = "案件执行立案申请 视图数据对象", description = "案件执行立案申请 视图数据对象") @ApiModel(value = "案件执行立案申请 视图数据对象", description = "案件执行立案申请 视图数据对象")
public class LoanCaseExecuteApplyVo implements Vo { public class LoanCaseExecuteApplyVo implements Vo {
@ -79,6 +66,10 @@ public class LoanCaseExecuteApplyVo implements Vo {
private String executeDeadline; private String executeDeadline;
@ApiModelProperty("执行立案金额") @ApiModelProperty("执行立案金额")
private String executeRegisMoney; private String executeRegisMoney;
@ApiModelProperty("当前欠款金额")
private BigDecimal amountInArear;
@ApiModelProperty("预计申请还账金额")
private BigDecimal badDebtAmount;
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; private String procDefId;
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyMapper.java
View File

@ -69,4 +69,8 @@ public interface LoanCaseCloseApplyMapper extends BaseMapper<LoanCaseCloseApply>
int selectBySid(String join); int selectBySid(String join);
int updateFlowFiled(Map<String, Object> map); int updateFlowFiled(Map<String, Object> map);
String selectMoney(String busSid);
String selectFeesMoney(String busSid);
} }

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyMapper.xml
View File

@ -40,4 +40,12 @@
</if> </if>
WHERE sid=#{sid} WHERE sid=#{sid}
</update> </update>
<select id="selectMoney" resultType="java.lang.String">
select ifnull(sum(preserveMoney),0) as money from loan_case_progress_preserve where mainSid = #{busSid}
</select>
<select id="selectFeesMoney" resultType="java.lang.String">
select ifnull(sum(paymentMoney),0) as money from loan_case_progress_fees where mainSid = #{busSid} and paymentItems != '其他收入'
</select>
</mapper> </mapper>

379
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
View File

@ -31,7 +31,20 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@ -55,6 +68,7 @@ import com.yxt.anrui.riskcenter.api.loancasecloseapply.*;
import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancasecloseapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto; import com.yxt.anrui.riskcenter.api.loancasecloseveh.LoanCaseCloseVehDto;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApply;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyVo;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteFile;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
@ -66,6 +80,7 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService; import com.yxt.anrui.riskcenter.biz.loancasecloseveh.LoanCaseCloseVehService;
import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@ -74,6 +89,8 @@ import com.yxt.anrui.riskcenter.biz.loancaseprogressexecutemeasure.LoanCaseProgr
import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService; import com.yxt.anrui.riskcenter.biz.loancaseprogresstrial.LoanCaseProgressTrialService;
import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService; import com.yxt.anrui.riskcenter.biz.loancaseprogressveh.LoanCaseProgressVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowVo;
@ -88,7 +105,10 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -138,6 +158,21 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
@Autowired @Autowired
private FlowFeign flowFeign; private FlowFeign flowFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private LoanRestoreReportApplyService loanRestoreReportApplyService;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
public PagerVo<LoanCaseCloseApplyVo> listPageVo(PagerQuery<LoanCaseCloseApplyQuery> pq) { public PagerVo<LoanCaseCloseApplyVo> listPageVo(PagerQuery<LoanCaseCloseApplyQuery> pq) {
LoanCaseCloseApplyQuery query = pq.getParams(); LoanCaseCloseApplyQuery query = pq.getParams();
QueryWrapper<LoanCaseCloseApply> qw = new QueryWrapper<>(); QueryWrapper<LoanCaseCloseApply> qw = new QueryWrapper<>();
@ -466,6 +501,46 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
LoanCaseCloseApply finalLoanCaseCloseApply = loanCaseCloseApply;
Future future1 = pool.submit(() -> {
//推送财务凭证
//TOdO:
pushRiskToFin(bv.getBusinessSid());
//修改风控状态为执行
//--更新销售订单车辆表的风控状态为执行
List<String> zxjaBusVinSidList = new ArrayList<>();
List<String> ssjaBusVinSidList = new ArrayList<>();
List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(finalLoanCaseCloseApply.getBusSid());
for (int i = 0; i < busVinSidList.size(); i++) {
String busVinSid = busVinSidList.get(i);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
if("12".equals(busSalesOrderVehicle.getRiskState().toString())){
zxjaBusVinSidList.add(busVinSid);
}else{
ssjaBusVinSidList.add(busVinSid);
}
}
BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
if(!zxjaBusVinSidList.isEmpty()){
busVinStateSetQuery.setState(14);
busVinStateSetQuery.setBusVinSidList(zxjaBusVinSidList);
ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
}
if(!ssjaBusVinSidList.isEmpty()){
busVinStateSetQuery.setState(13);
busVinStateSetQuery.setBusVinSidList(ssjaBusVinSidList);
ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
}
});
} catch (Exception e) {
e.printStackTrace();
}
} else { } else {
//极光推送 //极光推送
@ -489,6 +564,308 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
} }
} }
public void pushRiskToFin(String sid){
LoanCaseCloseApply loanCaseCloseApply = fetchBySid(sid);
if(loanCaseCloseApply != null){
Voucher voucher = new Voucher();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanCaseCloseApply.getUseOrgSid()).getData();
if (null != organizationVo) {
voucher.setAccountBook(organizationVo.getOrgCode());
voucher.setVoucherNo(organizationVo.getOrgCode());
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos2 = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos3= new ArrayList<>();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseCloseApply.getDeptSid()).getData();
List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseCloseApply.getBusSid());
busVinSidList.removeAll(Collections.singleton(null));
BigDecimal executeExpenseAmount = BigDecimal.ZERO;
if(!busVinSidList.isEmpty()){
LoanCaseExecuteApply loanCaseExecuteApply = loanCaseProgressExecuteService.selectByBusSid(loanCaseCloseApply.getBusSid());
if(loanCaseExecuteApply != null){
executeExpenseAmount= loanCaseExecuteApply.getExecuteExpenseAmount();//预计申请坏账金额
if(executeExpenseAmount != null){
executeExpenseAmount = executeExpenseAmount.divide(BigDecimal.valueOf(busVinSidList.size()),2, RoundingMode.HALF_UP);
}
}
for (int i = 0; i < busVinSidList.size(); i++) {
String busVinSid = busVinSidList.get(i);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
String customerNumber = "";
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
if (salesOrder != null && busSalesOrderVehicle != null) {
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
}
bdCustomer.setTOrgIds(deptVo.getOrgCode());
if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
}
} else {
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
}
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
BigDecimal zjzyfMoney = BigDecimal.ZERO;
String zjzyf = alrepaidAndArrVo.getWheFundOccMoney();
zjzyfMoney = zjzyfMoney.add(new BigDecimal(StringUtils.isBlank(zjzyf)?"0":zjzyf));
//应收贷款车欠款_待处理欠款_待执行-（当前欠款合计-预申请坏账金额）
BigDecimal all = BigDecimal.ZERO;
//预申请坏账金额
BigDecimal ysqhz = BigDecimal.ZERO;
BigDecimal ssf = BigDecimal.ZERO;
BigDecimal fxMoney = BigDecimal.ZERO;
//诉讼保全费
String preserveMoney = baseMapper.selectMoney(loanCaseCloseApply.getBusSid());
//除其他收入外的诉讼费用
String feesMoney = baseMapper.selectFeesMoney(loanCaseCloseApply.getBusSid());
ssf = ssf.add(StringUtils.isNotBlank(preserveMoney)?new BigDecimal(preserveMoney):BigDecimal.ZERO).add(StringUtils.isNotBlank(feesMoney)?new BigDecimal(feesMoney):BigDecimal.ZERO);
fxMoney = all.add(ssf);
ysqhz = executeExpenseAmount;
String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
all = all.add(StringUtils.isNotBlank(allMoney)?new BigDecimal(allMoney):BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney)?new BigDecimal(wdqMoney):BigDecimal.ZERO);
if("12".equals(busSalesOrderVehicle.getRiskState().toString())){//执行结案
//-------------------------------------------应收贷款车欠款_待处理欠款_待执行-（当前欠款合计-预申请坏账金额）
if (all.compareTo(BigDecimal.ZERO) > 0) {
all = all.subtract(ysqhz);
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"执行结案");
voucherResultDetailDtoDf.setSubjectNo("1201.03.05");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(all.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
}
//---------------------------------------------预提费用_诉讼保全费
if(ssf.compareTo(BigDecimal.ZERO)>0){
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"执行结案");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(ssf.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
}
//--------------------------------------------待处理财产损溢 风险准备金
if(fxMoney.compareTo(BigDecimal.ZERO)>0){
//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"执行结案");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(fxMoney.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJf);
}
//**转执行减免资金占用费
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"执行结案减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//---------------------------------------------------------借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"执行结案减免资金占用费");
voucherResultDetailDtoJf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(zjzyfMoney.negate().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJf);
}
}
if("11".equals(busSalesOrderVehicle.getRiskState().toString())){//二次销售诉讼结案
//-------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼-当前欠款合计
if(all.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(all.toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
}
//------------------------预提费用_诉讼保全费
if(ssf.compareTo(BigDecimal.ZERO)>0){
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(ssf.toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
}
//-------------------------待处理财产损溢 风险准备金
if(fxMoney.compareTo(BigDecimal.ZERO)>0){
//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(fxMoney.toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoJf);
}
//---------------------------**诉讼结案减免资金占用费
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoDf);
//---------------------------------------------------------借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"诉讼结案减免资金占用费");
voucherResultDetailDtoJf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(zjzyfMoney.negate().toString());
voucherResultDetailDtos2.add(voucherResultDetailDtoJf);
}
}
if("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "10".equals(busSalesOrderVehicle.getRiskState().toString())){//扣回或未扣回诉讼结案
//-------------------应收贷款车欠款_待处理欠款_处置车辆_已诉讼
if(all.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(all.toString());
voucherResultDetailDtos3.add(voucherResultDetailDtoDf);
}
//------------------------预提费用_诉讼保全费
if(ssf.compareTo(BigDecimal.ZERO)>0){
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoDf.setSubjectNo("2191.25");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(ssf.toString());
voucherResultDetailDtos3.add(voucherResultDetailDtoDf);
}
//-------------------------待处理财产损溢 风险准备金
if(fxMoney.compareTo(BigDecimal.ZERO)>0){
//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"诉讼结案");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(fxMoney.toString());
voucherResultDetailDtos3.add(voucherResultDetailDtoJf);
}
//---------------------------**诉讼结案减免资金占用费
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼结案减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos3.add(voucherResultDetailDtoDf);
//---------------------------------------------------------借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"诉讼结案减免资金占用费");
voucherResultDetailDtoJf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(zjzyfMoney.negate().toString());
voucherResultDetailDtos3.add(voucherResultDetailDtoJf);
}
}
}
if(!voucherResultDetailDtos.isEmpty()){
voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeign.saveVoucher(voucher);
}
if(!voucherResultDetailDtos2.isEmpty()){
voucher.setResultDetails(voucherResultDetailDtos2);
finKingDeeFeign.saveVoucher(voucher);
}
if(!voucherResultDetailDtos3.isEmpty()){
voucher.setResultDetails(voucherResultDetailDtos3);
finKingDeeFeign.saveVoucher(voucher);
}
}
}
}
public ResultBean<List<LoanCaseCloseApplyNodeVo>> getPreviousNodesForReject(LoanCaseCloseApplyNodeQuery query) { public ResultBean<List<LoanCaseCloseApplyNodeVo>> getPreviousNodesForReject(LoanCaseCloseApplyNodeQuery query) {
ResultBean<List<LoanCaseCloseApplyNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<LoanCaseCloseApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
@ -667,7 +1044,9 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
loanCaseCloseApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo()); loanCaseCloseApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
loanCaseCloseApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString()); loanCaseCloseApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull()); loanCaseCloseApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
if (loanCaseProgress.getSueMoney() != null){
loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString()); loanCaseCloseApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
}
loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows()); loanCaseCloseApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

36
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
View File

@ -60,11 +60,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealApply;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.LoanCaseAppealFile;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.LoanCaseAppealApplyNodeVo;
import com.yxt.anrui.riskcenter.api.loancaseappealapply.flowable.SubmitLoanCaseAppealApplyDto;
import com.yxt.anrui.riskcenter.api.loancaseappealveh.LoanCaseAppealVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.*;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo; import com.yxt.anrui.riskcenter.api.loancaseexecuteveh.LoanCaseExecuteVehDetailsVo;
@ -74,7 +69,6 @@ import com.yxt.anrui.riskcenter.api.loancaseprogresstrial.LoanCaseProgressTrial;
import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh; import com.yxt.anrui.riskcenter.api.loancaseprogressveh.LoanCaseProgressVeh;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService; import com.yxt.anrui.riskcenter.biz.loancaseexecuteveh.LoanCaseExecuteVehService;
import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService; import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
@ -93,28 +87,14 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* Project: anrui-riskcenter(案件执行立案申请) <br/>
* File: LoanCaseExecuteApplyService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyService <br/>
* Description: 案件执行立案申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-02-07 10:00:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service @Service
public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExecuteApplyMapper, LoanCaseExecuteApply> { public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExecuteApplyMapper, LoanCaseExecuteApply> {
@ -575,6 +555,10 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanCaseExecuteApply.getDeptSid()).getData();
List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid()); List<String> busVinSidList = loanCaseProgressVehService.selectByMainSid(loanCaseExecuteApply.getBusSid());
BigDecimal executeAmountInArear= loanCaseExecuteApply.getExecuteAmountInArear();//其中执行欠款金额
if(executeAmountInArear != null){
executeAmountInArear = executeAmountInArear.divide(BigDecimal.valueOf(busVinSidList.size()),2, RoundingMode.HALF_UP);
}
for (int i = 0; i < busVinSidList.size(); i++) { for (int i = 0; i < busVinSidList.size(); i++) {
String busVinSid = busVinSidList.get(i); String busVinSid = busVinSidList.get(i);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@ -628,8 +612,8 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid); String allMoney = loanRepaymentPlanDetailsService.selectAllMoney(busVinSid);
String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid); String wdqMoney = loanRepaymentPlanDetailsService.getWdq(busVinSid);
all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO); all = all.add(StringUtils.isNotBlank(allMoney) ? new BigDecimal(allMoney) : BigDecimal.ZERO).add(StringUtils.isNotBlank(wdqMoney) ? new BigDecimal(wdqMoney) : BigDecimal.ZERO);
qzzxqk = executeAmountInArear;
ysqhz = all.subtract(qzzxqk);
//贷方 //贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
//借方 //借方
@ -858,7 +842,9 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo()); loanCaseExecuteApplyDetailsVo.setBankContract(loanCaseProgress.getBankContractNo());
loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString()); loanCaseExecuteApplyDetailsVo.setArrearsTotal(loanCaseProgress.getAmountAll().toString());
loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull()); loanCaseExecuteApplyDetailsVo.setIsFullLitigation(loanCaseProgress.getFull());
if (loanCaseProgress.getSueMoney() != null){
loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString()); loanCaseExecuteApplyDetailsVo.setSueMoneyTotal(loanCaseProgress.getSueMoney().toString());
}
loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows()); loanCaseExecuteApplyDetailsVo.setPartProceRemarks(loanCaseProgress.getSueShows());
LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage()); LoanCaseProgressTrial loanCaseProgressTrial = loanCaseProgressTrialService.selByJdAndSid(sid, loanCaseProgress.getCaseStage());
loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime())); loanCaseExecuteApplyDetailsVo.setJudgDate(DateUtil.formatDate(loanCaseProgressTrial.getVerdictTime()));
@ -897,6 +883,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles); loanCaseExecuteApplyDetailsVo.setPjclFiles(pjclFiles);
List<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehDetailsVos = new ArrayList<>(); List<LoanCaseExecuteVehDetailsVo> loanCaseExecuteVehDetailsVos = new ArrayList<>();
List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid); List<LoanCaseProgressVeh> loanCaseProgressVehs = loanCaseProgressVehService.selByMainSid(sid);
BigDecimal amountInArear = BigDecimal.ZERO;
for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) { for (LoanCaseProgressVeh loanCaseProgressVeh : loanCaseProgressVehs) {
LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo(); LoanCaseExecuteVehDetailsVo loanCaseExecuteVehDetailsVo = new LoanCaseExecuteVehDetailsVo();
loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo()); loanCaseExecuteVehDetailsVo.setVinNo(loanCaseProgressVeh.getVinNo());
@ -905,8 +892,11 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus()); loanCaseExecuteVehDetailsVo.setCarState(loanCaseProgressVeh.getVehStatus());
loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks()); loanCaseExecuteVehDetailsVo.setRemarks(loanCaseProgressVeh.getRemarks());
loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo); loanCaseExecuteVehDetailsVos.add(loanCaseExecuteVehDetailsVo);
AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(loanCaseProgressVeh.getBusVinSid());
amountInArear = amountInArear.add(new BigDecimal(alrepaidAndArr2.getCurrentBeMoney()));
} }
loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos); loanCaseExecuteApplyDetailsVo.setLoanCaseExecuteVehList(loanCaseExecuteVehDetailsVos);
loanCaseExecuteApplyDetailsVo.setAmountInArear(amountInArear.toString());
return rb.success().setData(loanCaseExecuteApplyDetailsVo); return rb.success().setData(loanCaseExecuteApplyDetailsVo);
} }
} }

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.java
View File

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.biz.loancaseprogressexecute; package com.yxt.anrui.riskcenter.biz.loancaseprogressexecute;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApply;
import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed;
import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -17,4 +18,6 @@ public interface LoanCaseProgressExecuteMapper extends BaseMapper<LoanCaseProgre
@Select("select * from loan_case_progress_execute where mainSid = #{sid} and terminate = '0'") @Select("select * from loan_case_progress_execute where mainSid = #{sid} and terminate = '0'")
LoanCaseProgressExecute selByMainSid(String sid); LoanCaseProgressExecute selByMainSid(String sid);
LoanCaseExecuteApply selectByBusSid(String busSid);
} }

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteMapper.xml
View File

@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteMapper"> <mapper namespace="com.yxt.anrui.riskcenter.biz.loancaseprogressexecute.LoanCaseProgressExecuteMapper">
<select id="selectByBusSid" resultType="com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApply">
select * from loan_case_execute_apply where busSid = #{busSid} order by id desc limit 1
</select>
</mapper> </mapper>

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogressexecute/LoanCaseProgressExecuteService.java
View File

@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loancaseprogressexecute;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApply;
import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed; import com.yxt.anrui.riskcenter.api.loancaseprogressclosed.LoanCaseProgressClosed;
import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
@ -29,4 +30,8 @@ public class LoanCaseProgressExecuteService extends MybatisBaseService<LoanCaseP
public LoanCaseProgressExecute selByMainSid(String sid) { public LoanCaseProgressExecute selByMainSid(String sid) {
return baseMapper.selByMainSid(sid); return baseMapper.selByMainSid(sid);
} }
public LoanCaseExecuteApply selectByBusSid(String busSid) {
return baseMapper.selectByBusSid(busSid);
}
} }

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
View File

@ -674,9 +674,9 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanOutboundApply.getApplySid()); LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanOutboundApply.getApplySid());
if(loanSecondarySalesCost.getIsRecovery() != null){ if(loanSecondarySalesCost.getIsRecovery() != null){
if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿 if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿
busVinStateSetQuery.setState(4);//不追偿 busVinStateSetQuery.setState(8);//不追偿
}else{//追偿 }else{//追偿
busVinStateSetQuery.setState(5);//处置损失 busVinStateSetQuery.setState(7);//处置损失
} }
ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
} }

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

@ -796,7 +796,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
//--更新销售订单车辆表的风控状态为客户赎回中 //--更新销售订单车辆表的风控状态为客户赎回中
BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery(); BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
List<String> busVinSidList = redemptionVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList()); List<String> busVinSidList = redemptionVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
busVinStateSetQuery.setState(9);//客户赎回中 busVinStateSetQuery.setState(4);//客户赎回中
ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
//--------更新风控状态结束 //--------更新风控状态结束
FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR(); FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR();

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
View File

@ -559,7 +559,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
//--更新销售订单车辆表的风控状态为二次销售中 //--更新销售订单车辆表的风控状态为二次销售中
BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery(); BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
List<String> busVinSidList = list.stream().map(v->v.getBusVinSid()).collect(Collectors.toList()); List<String> busVinSidList = list.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
busVinStateSetQuery.setState(10);//二次销售中 busVinStateSetQuery.setState(5);//二次销售中
ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
//--------更新风控状态结束 //--------更新风控状态结束

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

@ -702,7 +702,7 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
//--更新销售订单车辆表的风控状态为二次转租中 //--更新销售订单车辆表的风控状态为二次转租中
BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery(); BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
List<String> busVinSidList = subletVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList()); List<String> busVinSidList = subletVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
busVinStateSetQuery.setState(11);//二次转租中 busVinStateSetQuery.setState(6);//二次转租中
ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery); ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
try { try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryallocatebill/AppInventoryAllocatebillService.java
View File

@ -173,9 +173,9 @@ public class AppInventoryAllocatebillService {
if ("1".equals(type)) { if ("1".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery);
} else if ("2".equals(type)) { } else if ("2".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit2(getNodeQuery);
} else if ("3".equals(type)) { } else if ("3".equals(type)) {
getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit(getNodeQuery); getNextNodesForSubmit = wmsInventoryAllocatebillFeign.getNextNodesForSubmit3(getNodeQuery);
} }
if (getNextNodesForSubmit.getSuccess()) { if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));

Write Preview
Loading…
Cancel
Save