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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
fa923ca80e 8d4ab3417c
commit
83611aaf2f
4 changed files with 46 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  2. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  3. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java
  4. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

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

@ -554,11 +554,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
checkWord.add("期数不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getPeriod())){
if (StringUtils.isNotBlank(excelInfo.getPeriod())) {
String period = excelInfo.getPeriod();
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
boolean matches = pattern.matcher(period).matches();
if (!matches){
if (!matches) {
checkWord.add("期数必须为数字");
break;
}
@ -567,11 +567,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
checkWord.add("逾期本金不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getBePrincipal())){
if (StringUtils.isNotBlank(excelInfo.getBePrincipal())) {
String bePrincipal = excelInfo.getBePrincipal();
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
boolean matches = pattern.matcher(bePrincipal).matches();
if (!matches){
if (!matches) {
checkWord.add("逾期本金必须为数字");
break;
}
@ -580,11 +580,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
checkWord.add("逾期罚息不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getBeDefInter())){
if (StringUtils.isNotBlank(excelInfo.getBeDefInter())) {
String beDefInter = excelInfo.getBeDefInter();
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
boolean matches = pattern.matcher(beDefInter).matches();
if (!matches){
if (!matches) {
checkWord.add("逾期罚息必须为数字");
break;
}
@ -848,6 +848,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
LoanBePadsincereApply loanBePadsincereApply = fetchBySid(businessSid);
List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(loanBePadsincereApply.getSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
@ -871,31 +872,33 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
finPaymentrecordDto.setApplySid("");
finPaymentrecordDto.setPayCompanySid("");
finPaymentrecordDto.setPayType(0);
finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
finPaymentrecordDto.setCostTypeKey("");
finPaymentrecordDto.setCostTypeValue("");
finPaymentrecordDto.setCostTitleKey("");
finPaymentrecordDto.setCostTitleValue("");
finPaymentrecordDto.setReceiveBank("");
finPaymentrecordDto.setReceiveBankAccount("");
finPaymentrecordDto.setReceiveCompany("");
finPaymentrecordDto.setCost(0);
finPaymentrecordDto.setAccountsReceive(0);
finPaymentrecordDto.setBusSid("");
finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
finPaymentrecordDto.setPayCode("");
finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
finPaymentrecordDto.setPurchaseSystemSid("");
finPaymentrecordDto.setPurchaseSystemName("");
finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
finPaymentrecordFeign.save(finPaymentrecordDto);
for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
finPaymentrecordDto.setPayCompanySid("");
finPaymentrecordDto.setPayType(1);
finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
finPaymentrecordDto.setCostTypeKey("007");
finPaymentrecordDto.setCostTypeValue("垫款");
finPaymentrecordDto.setCostTitleKey("008");
finPaymentrecordDto.setCostTitleValue("月还");
finPaymentrecordDto.setReceiveBank(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
finPaymentrecordDto.setReceiveBankAccount(loanBePadsincereVehDetailsVo.getBankCollectionNum());
finPaymentrecordDto.setReceiveCompany("");
finPaymentrecordDto.setCost(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
finPaymentrecordDto.setAccountsReceive(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());
finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
finPaymentrecordDto.setPayCode("");
finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
finPaymentrecordDto.setPurchaseSystemSid("");
finPaymentrecordDto.setPurchaseSystemName("");
finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
finPaymentrecordFeign.save(finPaymentrecordDto);
}
} else {
//极光推送
loanBePadsincereApply = fetchBySid(businessSid);

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
View File

@ -53,6 +53,7 @@
AND lrpd.period = #{period}
AND lrpd.bankContractNo = #{bankContractNo}
AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
AND lrh.`updateState` = '1'
GROUP BY lrpd.`sid`
HAVING (yq_total > 0)
</select>

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java
View File

@ -56,6 +56,10 @@ public class AppBeCollectionVehDetailsVo implements Vo {
@ApiModelProperty("是否有担保人")
private Boolean showDbr = false;
@ApiModelProperty("是否有还款协议")
private Boolean showXy = false;
@ApiModelProperty("是否有远程控制")
private Boolean showYckz = false;
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid;
@ApiModelProperty("贷款合同编号")

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
View File

@ -307,9 +307,15 @@ public class BeCollectionService {
AppBeCollectionVehDetailsVo appBeCollectionVehDetailsVo = new AppBeCollectionVehDetailsVo();
appBeCollectionVehDetailsVo.setSaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(loanBeCollectionVehDetail.getSaleVehSid()).getData();
if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())) {
if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName()) && collMeasures.contains("增加担保人")) {
appBeCollectionVehDetailsVo.setShowDbr(true);
}
if (collMeasures.contains("远程控制")){
appBeCollectionVehDetailsVo.setShowYckz(true);
}
if (collMeasures.contains("签订还款协议")){
appBeCollectionVehDetailsVo.setShowXy(true);
}
appBeCollectionVehDetailsVo.setContractId(loanBeCollectionVehDetail.getLoanContractNo());
appBeCollectionVehDetailsVo.setVin(loanBeCollectionVehDetail.getVinNo());
appBeCollectionVehDetailsVo.setCarNum(loanBeCollectionVehDetail.getCarNum());

Write Preview
Loading…
Cancel
Save