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 2 years ago
parent
97601362f3 82898d9e73
commit
90aad12d20
2 changed files with 56 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
  2. 75
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

18
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
View File

@ -409,6 +409,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(false);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
entity.setTypeKey("1");
entity.setType("资方常规");
} else {//金融定制
@ -423,6 +426,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
entity.setTypeKey("1");
entity.setType("资方常规");
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
@ -614,6 +620,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setShowMore(false);
}
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
@ -629,6 +638,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
@ -666,6 +678,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setShowMore(false);
}
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
@ -685,6 +700,9 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){
return rb.setMsg(resultBean.getMsg());
}
}else{
loanSolutionsFeign.deleteByOrderSid(sid);
}

75
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
View File

@ -2187,11 +2187,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
public ResultBean<SolutionssVo> selectDetails3(String busSid) {
ResultBean<SolutionssVo> rb = ResultBean.fireFail();
SolutionssVo solutionssVo = new SolutionssVo();
SolutionssVo solutionssVo = null;
//根据关联sid查询是否存在金融方案
LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid);
boolean isTrue = false;
if (loanSolutions != null) {
solutionssVo = new SolutionssVo();
BeanUtil.copyProperties(loanSolutions, solutionssVo);
if (loanSolutions.getTrailerAmount() != null) {
solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString());
@ -2205,37 +2206,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
}
isTrue = true;
}
//全款且为三方金融
if(StringUtils.isBlank(loanSolutions.getTypeKey())){
solutionssVo.setShowMore(true);
solutionssVo.setFactoryDiscountUse("抵利息");
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}
}
}
}else{
if ("02".equals(loanSolutions.getTypeKey())) {
solutionssVo.setFactoryDiscountUse("抵车款");
if (isTrue) {
solutionssVo.setShowMore(false);
} else {
solutionssVo.setShowMore(false);
}
}else{
//全款且为三方金融
if(StringUtils.isBlank(loanSolutions.getTypeKey())){
solutionssVo.setShowMore(true);
solutionssVo.setFactoryDiscountUse("抵利息");
if (isTrue) {
@ -2255,13 +2227,42 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
}
}
}else{
if ("02".equals(loanSolutions.getTypeKey())) {
solutionssVo.setFactoryDiscountUse("抵车款");
if (isTrue) {
solutionssVo.setShowMore(false);
} else {
solutionssVo.setShowMore(false);
}
}else{
solutionssVo.setShowMore(true);
solutionssVo.setFactoryDiscountUse("抵利息");
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}
}
}
}
}
if (isTrue) {
List<SolutionListVo> formList = getFormList(solutionssVo);
solutionssVo.setFinanceForms(formList);
}
solutionssVo.setBusSid(busSid);
}
if (isTrue) {
List<SolutionListVo> formList = getFormList(solutionssVo);
solutionssVo.setFinanceForms(formList);
}
solutionssVo.setBusSid(busSid);
return rb.success().setData(solutionssVo);
}

Write Preview
Loading…
Cancel
Save