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

移动端客户洽谈需求

zhanglei
dimengzhe 2 years ago
parent
432a0d1f3d
commit
6b81e5dfbf
4 changed files with 143 additions and 98 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. 56
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  2. 180
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
  3. 0
      anrui-fin/anrui-fin-biz/src/main/resources/file/confirm.docx
  4. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java

56
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -2097,18 +2097,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
UserRoleQuery userRoleQuery = new UserRoleQuery(); UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setRoleSid(candidateGroups.get(0));
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder(); sysUserVos.removeAll(Collections.singleton(null));
String nextNodeUserSids = "";
if(sysUserVos.size()>0){
nextNodeUserSids = String.join(",",sysUserVos.stream().map(v->v.getSid()).collect(Collectors.toList()));
}
/* StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) { if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) { for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid(); String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(","); nextNodeUserSids.append(sid).append(",");
} }
} }*/
if (StringUtils.isBlank(nextNodeUserSids)) { if (StringUtils.isBlank(nextNodeUserSids)) {
return rb.setMsg("下一环节暂无操作人员"); // return rb.setMsg("下一环节暂无操作人员");
nextNodeUserSids = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
} }
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); // String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring); bv.setNextNodeUserSids(nextNodeUserSids);
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
if (!resultBean1.getSuccess()) { if (!resultBean1.getSuccess()) {
@ -2116,21 +2122,33 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
} }
UpdateFlowFieldVo ufVos = resultBean1.getData(); UpdateFlowFieldVo ufVos = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
if (!"Event_end".equals(ufVos.getTaskDefKey())) { if (!"Event_end".equals(ufVos.getTaskDefKey())) {
//极光推送 try {
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); .setNameFormat("demo-pool-%d").build();
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); ExecutorService pool = new ThreadPoolExecutor(2, 100,
MessageFlowVo messageFlowVo = new MessageFlowVo(); 0L, TimeUnit.MILLISECONDS,
BeanUtil.copyProperties(ufVos, messageFlowVo); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply1 = busArrearsCarryVehicleApply;
messageFlowableQuery.setUfVo(messageFlowVo); Future future1 = pool.submit(() -> {
messageFlowableQuery.setAppMap(appMap); //极光推送
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId());
messageFlowableQuery.setModuleName("欠款提车申请"); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); MessageFlowVo messageFlowVo = new MessageFlowVo();
messageFlowableQuery.setMsgTitle("欠款提车申请"); BeanUtil.copyProperties(ufVos, messageFlowVo);
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply1.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
} else { } else {
List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid()); List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
for (BusArrearsCarryVehicleDetails adCarListDto : carList) { for (BusArrearsCarryVehicleDetails adCarListDto : carList) {

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

@ -396,7 +396,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
} else { } else {
entity.setVehicleModelOffer(null); entity.setVehicleModelOffer(null);
} }
if ("1".equals(dto.getPurchaseMethod())) { if ("1".equals(dto.getPurchaseMethod())) {//全款
if ("1".equals(dto.getFinancePlan())) { if ("1".equals(dto.getFinancePlan())) {
entity.setType(null); entity.setType(null);
entity.setTypeKey(null); entity.setTypeKey(null);
@ -404,41 +404,55 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
} else { } else {
if ("1".equals(dto.getFinTypeKey())) {//资方常规 if ("1".equals(dto.getFinTypeKey())) {//资方常规
AppCrmSolutions finNormal = dto.getFinNormal(); AppCrmSolutions finNormal = dto.getFinNormal();
if (finNormal != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
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{
boolean isShowMore = finNormal.isShowMore();
if (isShowMore) {
loanSolutionsFeign.deleteByOrderSid(sid);
}
}
} else {//金融定制
}
}
} else {//贷款
if ("1".equals(dto.getFinTypeKey())) {//资方常规
AppCrmSolutions finNormal = dto.getFinNormal();
if (finNormal != null) {
SolutionssDto solutionsDto = new SolutionssDto(); SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(finNormal, solutionsDto, "sid"); BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(sid); solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(false); solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){ if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
entity.setTypeKey("1"); entity.setTypeKey("1");
entity.setType("资方常规"); entity.setType("资方常规");
} else {//金融定制 SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
if (loanSolutions != null) {
} if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
} entity.setFinancePlan("4");//担保
} else { entity.setFinancePlanValue("担保");//担保
if ("1".equals(dto.getFinTypeKey())) {//资方常规 } else {
AppCrmSolutions finNormal = dto.getFinNormal(); entity.setFinancePlan("3");//自营非担保
SolutionssDto solutionsDto = new SolutionssDto(); entity.setFinancePlanValue("自营非担保");//自营非担保
BeanUtil.copyProperties(finNormal, solutionsDto, "sid"); }
solutionsDto.setSaleOrderSid(sid); }
solutionsDto.setShowMore(true); } else {//若存在
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); boolean isShowMore = finNormal.isShowMore();
if(!resultBean.getSuccess()){ if (!isShowMore) {
return rb.setMsg(resultBean.getMsg()); loanSolutionsFeign.deleteByOrderSid(sid);
}
entity.setTypeKey("1");
entity.setType("资方常规");
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
entity.setFinancePlan("4");//担保
entity.setFinancePlanValue("担保");//担保
} else {
entity.setFinancePlan("3");//自营非担保
entity.setFinancePlanValue("自营非担保");//自营非担保
} }
} }
} else {//金融定制 } else {//金融定制
@ -620,7 +634,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setShowMore(false); solutionsDto.setShowMore(false);
} }
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){ if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
} }
@ -630,32 +644,35 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
} }
} else { } else {
//新增客户的金融方案 //新增客户的金融方案
if ("1".equals(dto.getTypeKey())) {//资方常规 if(StringUtils.isNotBlank(dto.getTypeKey())){
CrmSolutions crmSolutions = dto.getCrmSolutions(); if ("1".equals(dto.getTypeKey())) {//资方常规
if (crmSolutions != null) { CrmSolutions crmSolutions = dto.getCrmSolutions();
SolutionssDto solutionsDto = new SolutionssDto(); if (crmSolutions != null) {
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid"); SolutionssDto solutionsDto = new SolutionssDto();
solutionsDto.setSaleOrderSid(sid); BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setShowMore(true); solutionsDto.setSaleOrderSid(sid);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); solutionsDto.setShowMore(true);
if(!resultBean.getSuccess()){ ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
return rb.setMsg(resultBean.getMsg()); if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
} }
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
} else {//定制金融
} }
crmVehicledemand.setTypeKey("1"); SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
crmVehicledemand.setType("资方常规"); if (loanSolutions != null) {
} else {//定制金融 if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
} crmVehicledemand.setFinancePlan("4");//担保
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData(); crmVehicledemand.setFinancePlanValue("担保");//担保
if (loanSolutions != null) { } else {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) { crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlan("4");//担保 crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
crmVehicledemand.setFinancePlanValue("担保");//担保 }
} else {
crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
} }
} }
} }
baseMapper.insert(crmVehicledemand); baseMapper.insert(crmVehicledemand);
@ -666,7 +683,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
} }
BeanUtil.copyProperties(dto, crmVehicledemand, "sid"); BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid()); crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
if ("1".equals(dto.getPurchaseMethod())) { if ("1".equals(dto.getPurchaseMethod())) {//全款
if ("2".equals(dto.getFinancePlan())) {//三方金融 if ("2".equals(dto.getFinancePlan())) {//三方金融
if ("1".equals(dto.getTypeKey())) {//资方常规 if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions(); CrmSolutions crmSolutions = dto.getCrmSolutions();
@ -678,7 +695,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
solutionsDto.setShowMore(false); solutionsDto.setShowMore(false);
} }
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if(!resultBean.getSuccess()){ if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
} }
@ -690,36 +707,43 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
crmVehicledemand.setTypeKey(null); crmVehicledemand.setTypeKey(null);
loanSolutionsFeign.deleteByOrderSid(sid); loanSolutionsFeign.deleteByOrderSid(sid);
} }
} else { } else {//贷款
//新增客户的金融方案 //新增客户的金融方案
if ("1".equals(dto.getTypeKey())) {//资方常规 if(StringUtils.isNotBlank(dto.getTypeKey())){
CrmSolutions crmSolutions = dto.getCrmSolutions(); if ("1".equals(dto.getTypeKey())) {//资方常规
if (crmSolutions != null) { CrmSolutions crmSolutions = dto.getCrmSolutions();
SolutionssDto solutionsDto = new SolutionssDto(); if (crmSolutions != null) {
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid"); SolutionssDto solutionsDto = new SolutionssDto();
solutionsDto.setSaleOrderSid(sid); BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setShowMore(true); solutionsDto.setSaleOrderSid(sid);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); solutionsDto.setShowMore(true);
if(!resultBean.getSuccess()){ ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
return rb.setMsg(resultBean.getMsg()); if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
} else {
loanSolutionsFeign.deleteByOrderSid(sid);
} }
}else{ crmVehicledemand.setTypeKey("1");
loanSolutionsFeign.deleteByOrderSid(sid); crmVehicledemand.setType("资方常规");
} else {//定制金融
} }
crmVehicledemand.setTypeKey("1"); SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
crmVehicledemand.setType("资方常规"); if (loanSolutions != null) {
} else {//定制金融 if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
} crmVehicledemand.setFinancePlan("4");//担保
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData(); crmVehicledemand.setFinancePlanValue("担保");//担保
if (loanSolutions != null) { } else {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) { crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlan("4");//担保 crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
crmVehicledemand.setFinancePlanValue("担保");//担保 }
} else {
crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
} }
}else{
loanSolutionsFeign.deleteByOrderSid(sid);
crmVehicledemand.setTypeKey(null);
crmVehicledemand.setType(null);
} }
} }
baseMapper.updateById(crmVehicledemand); baseMapper.updateById(crmVehicledemand);
} }

0
anrui-fin/anrui-fin-biz/src/main/resources/file/confirm.docx
View File

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java
View File

@ -14,7 +14,6 @@ public class OtherPolicyVo implements Vo {
private static final long serialVersionUID = 699706797731138466L; private static final long serialVersionUID = 699706797731138466L;
private String sid; private String sid;
private String name; private String name;
@ApiModelProperty("年利率") @ApiModelProperty("年利率")
private String yearRatio; private String yearRatio;
@ -22,4 +21,8 @@ public class OtherPolicyVo implements Vo {
private String period; private String period;
@ApiModelProperty("期数key") @ApiModelProperty("期数key")
private String periodKey; private String periodKey;
@ApiModelProperty("最高融资额比例")
private String maxLoanRatio;
@ApiModelProperty("最高融资额")
private String maxLoanAmount;
} }

Write Preview
Loading…
Cancel
Save