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

非正常还款记账凭证修改

master
dimengzhe 1 week ago
parent
349fe18256
commit
c7e1217474
5 changed files with 76 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java
  2. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskPaymentVoucher.java
  4. 21
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  5. 43
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java
View File

@ -60,5 +60,7 @@ public class PaymentVoucher {
public String type;
@ApiModelProperty("核算维度银行")
public String bank;
private Integer riskState;
}
}

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -1818,6 +1818,22 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
}
} else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode())) {
dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
if("1".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_扣回车辆
dto1.setSubjectNo("1201.03.01");
}else if("7".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_车辆处置损失
dto1.setSubjectNo("1201.03.04.01");
}else if("9".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_诉讼车辆
dto1.setSubjectNo("1201.03.03");
}else if("11".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_已诉讼
dto1.setSubjectNo("1201.03.04.02");
}else if("12".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_待执行
dto1.setSubjectNo("1201.03.05");
}
dto1.setSubjectNo("1201.03.01");
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvoucher/RskPaymentVoucher.java
View File

@ -60,5 +60,7 @@ public class RskPaymentVoucher {
public String type;
@ApiModelProperty("核算维度银行")
public String bank;
public Integer riskState;
}
}

21
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
View File

@ -1401,6 +1401,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
if (StringUtils.isNotBlank(customerNumber)) {
voucherDetail.setCustomerCode(customerNumber);
}
voucherDetail.setRiskState(busSalesOrderVehicle.getRiskState());
voucherDetail.setAmount(beInter);
voucherDetails.add(voucherDetail);
}
@ -1856,7 +1857,6 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
@ -1877,7 +1877,6 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
// bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
@ -1953,6 +1952,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
if (StringUtils.isNotBlank(customerNumber)) {
voucherDetail.setCustomerCode(customerNumber);
}
voucherDetail.setRiskState(busSalesOrderVehicle.getRiskState());
voucherDetail.setAmount(beInter);
voucherDetails.add(voucherDetail);
}
@ -2000,7 +2000,22 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
}
}else if(voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode())){
dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
dto1.setSubjectNo("1201.03.01");
if("1".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_扣回车辆
dto1.setSubjectNo("1201.03.01");
}else if("7".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_车辆处置损失
dto1.setSubjectNo("1201.03.04.01");
}else if("9".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_诉讼车辆
dto1.setSubjectNo("1201.03.03");
}else if("11".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_已诉讼
dto1.setSubjectNo("1201.03.04.02");
}else if("12".equals(voucherDetail.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_待执行
dto1.setSubjectNo("1201.03.05");
}
}
}
dto1.setDimensionDept(voucherDetail.getDeptCode());

43
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
View File

@ -1075,26 +1075,44 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
if (StringUtils.isNotBlank(planDetails.getBankName())) {
//借方
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
String bankName = planDetails.getBankName();
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(bankName, "investorsCode").getData();
if (null != dictCommonVo) {
voucherResultDetailDtoJf.setSubjectNo(dictCommonVo.getDictValue());
}
voucherResultDetailDtoJf.setSummary(bankName+"划扣");
voucherResultDetailDtoDf.setSummary(bankName+"划扣");
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptCode);
//核算客户
voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf.setDebit(v.getActualMoney().toString());
voucherDetails2.add(voucherResultDetailDtoJf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(bankName+"划扣");
if("1".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_扣回车辆
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_车辆处置损失
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
}else if("9".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_诉讼车辆
voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
}else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_已诉讼
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
}else if("12".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_待执行
voucherResultDetailDtoDf.setSubjectNo("1201.03.05");
}
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptCode);
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(v.getActualMoney().toString());
voucherDetails2.add(voucherResultDetailDtoJf);
voucherDetails2.add(voucherResultDetailDtoDf);
}
@ -1118,7 +1136,22 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
voucherDetails2.add(voucherResultDetailDtoJf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(planDetails.getBankName()+"划扣");
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
if("1".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_扣回车辆
voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
}else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_车辆处置损失
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
}else if("9".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_诉讼车辆
voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
}else if("11".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_处置车辆_已诉讼
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.02");
}else if("12".equals(busSalesOrderVehicle.getRiskState().toString())){
//应收贷款车欠款_待处理欠款_待执行
voucherResultDetailDtoDf.setSubjectNo("1201.03.05");
}
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptCode);
//核算客户

Write Preview
Loading…
Cancel
Save