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 4 weeks ago
parent
6658d9b5d2 0454d7b3a6
commit
23f33aba96
3 changed files with 337 additions and 314 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. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 87
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  3. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java

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

@ -4418,13 +4418,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
//认资方退还垫款或者结清时资方逾期利息
if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) {
CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
voucherDetails.add(d);
}
//推送间还待转付列表
if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
String planSid = "";
if (v.getReceivablesName().equals("月还")) {
planSid = v.getReceivablesSid();
@ -4435,6 +4428,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
if("0".equals(busSalesOrderVehicle.getRiskState().toString())){
//认资方退还垫款或者结清时资方逾期利息
if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) {
CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
voucherDetails.add(d);
}
//推送间还待转付列表
if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
if (null != planDetails) {
if (v.getReceivablesName().equals("月还")) {
//推送间还认款记录
@ -4616,12 +4618,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//认资金占用费消减平台资金占用费
if (v.getReceivablesName().equals("资金占用费")) {
String planSid = "";
FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
if (jr != null) {
planSid = jr.getBusSid();
}
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
if (null != planDetails) {
LoanPlanDetailsVoForFundVoucher f = loanRepaymentPlanDetailsFeign.getLoanPlanDetailsVoForFundVoucher(planDetails.getBusVinSid());
if (null != f) {
@ -4672,6 +4668,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate);
voucherDetails.add(d);
}
}
});
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);

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

@ -315,19 +315,6 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
bv.setModelId(loanSecondarySalesApply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
if ("Activity_0rm74ey".equals(bv.getTaskDefKey())) {//风控处置岗审批
/* if (StringUtils.isBlank(query.getVehicleEvaluation())) {
return rb.setMsg("请填写评估价格");
}*/
LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(query.getBusinessSid());
if (loanSecondarySalesCost != null) {
if (new BigDecimal(query.getVehicleEvaluation()).compareTo(loanSecondarySalesCost.getVehPrice()) > 0) {
variables.put("isTrue", true);
} else {
variables.put("isTrue", false);
}
}
}
appMap.put("sid", query.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
@ -616,69 +603,107 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
finUncollectedReceivablesDetailedJR.setOrgSidPath(loanSecondarySalesApply.getOrgSidPath());
finUncollectedReceivablesDetailedJR.setKxState("01");
if ("02".equals(loanSecondarySalesCost.getBankSettleCostAssumeKey())){
if(loanSecondarySalesCost.getBankSettleCost() != null){
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("017");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("预计资方结清费用");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getBankSettleCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getBankSettleCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getBankSettleCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getBankSettleCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getVehicleViolationCostAssumeKey())){
if(loanSecondarySalesCost.getVehicleViolationCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("018");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("车辆违章费用");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getVehicleViolationCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getVehicleViolationCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getVehicleViolationCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getVehicleViolationCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getInspectYearCostAssumeKey())){
if(loanSecondarySalesCost.getInspectYearCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("019");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("年检费");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getInspectYearCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getInspectYearCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getInspectYearCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getInspectYearCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getInsureCostAssumeKey())){
if(loanSecondarySalesCost.getInsureCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("020");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("保险费");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getInsureCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getInsureCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getInsureCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getInsureCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getOwnershipCostAssumeKey())){
if(loanSecondarySalesCost.getOwnershipCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("021");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("过户费");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getOwnershipCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getOwnershipCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getOwnershipCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getOwnershipCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getStopCostAssumeKey())){
if(loanSecondarySalesCost.getStopCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("022");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("停车费");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getStopCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getStopCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getStopCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getStopCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
if ("02".equals(loanSecondarySalesCost.getOtherCostAssumeKey())){
if(loanSecondarySalesCost.getOtherCost() != null){
finUncollectedReceivablesDetailedJR.setSid(UUID.randomUUID().toString());
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("023 ");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("其他费用");
finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getOtherCostAssume()));
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getOtherCostAssume()));
finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getOtherCost());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getOtherCost());
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
}
}
} else {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
LoanSecondarySalesApply finalLoanSecondarySalesApply = loanSecondarySalesApply;
Future future1 = pool.submit(() -> {
//极光推送
loanSecondarySalesApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcDefId(loanSecondarySalesApply.getProcDefId());
messageFlowVo.setProcInsId(loanSecondarySalesApply.getProcInstId());
messageFlowVo.setProcDefId(finalLoanSecondarySalesApply.getProcDefId());
messageFlowVo.setProcInsId(finalLoanSecondarySalesApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("交回车辆二次销售申请");
messageFlowableQuery.setMsgContent(loanSecondarySalesApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(finalLoanSecondarySalesApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("交回车辆二次销售申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java
View File

@ -214,14 +214,14 @@ public class SecondarySalesService {
SecondSalesInitVo secondSalesInitVo = new SecondSalesInitVo();
LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery);
String data = "风控中心风控部经理审批/结束";
/*ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
}*/
secondSalesInitVo.setTitle(data);
List<ItemEditTextInfoCommon> itemEditTextInfos = new ArrayList<>();
ItemEditTextInfoCommon itemEditTextInfo = new ItemEditTextInfoCommon();

Write Preview
Loading…
Cancel
Save