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

优化

master
dimengzhe 2 years ago
parent
7ada61ef98
commit
572875d5ce
6 changed files with 87 additions and 117 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. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 179
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
  3. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java
  4. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
  5. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml
  6. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -2157,7 +2157,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(dto.getUserSid())) {
return rb.setMsg("用户sid不能为空");
}
// AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
SysUserVo sysUserInfoVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
//根据客户sid查询客户信息
ResultBean<AppCrmCustomerTempInfoVo> crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid());

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

@ -8,7 +8,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmfindemand.CrmFindemand;
import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto;
@ -415,7 +414,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
}
entity.setTypeKey("1");
entity.setType("资方常规");
}else{
} else {
boolean isShowMore = finNormal.isShowMore();
if (isShowMore) {
loanSolutionsFeign.deleteByOrderSid(sid);
@ -622,57 +621,11 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
crmVehicledemand.setStates("1");
if ("1".equals(dto.getPurchaseMethod())) {
if ("2".equals(dto.getFinancePlan())) {//三方金融
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions();
if (crmSolutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(sid);
if ("2".equals(dto.getFinancePlan())) {
solutionsDto.setShowMore(false);
}
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
}
}
ResultBean<CrmVehicledemand> resultBean = getCrmDemand(dto, crmVehicledemand);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
} else {
//新增客户的金融方案
if(StringUtils.isNotBlank(dto.getTypeKey())){
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions();
if (crmSolutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
} else {//定制金融
}
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
crmVehicledemand.setFinancePlan("4");//担保
crmVehicledemand.setFinancePlanValue("担保");//担保
} else {
crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
}
}
}
crmVehicledemand = resultBean.getData();
}
baseMapper.insert(crmVehicledemand);
@ -683,71 +636,81 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
}
BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
if ("1".equals(dto.getPurchaseMethod())) {//全款
if ("2".equals(dto.getFinancePlan())) {//三方金融
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions();
if (crmSolutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(sid);
if ("2".equals(dto.getFinancePlan())) {
solutionsDto.setShowMore(false);
}
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
ResultBean<CrmVehicledemand> resultBean = getCrmDemand(dto, crmVehicledemand);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
} else {
crmVehicledemand = resultBean.getData();
}
baseMapper.updateById(crmVehicledemand);
}
return rb.success();
}
public ResultBean<CrmVehicledemand> getCrmDemand(CrmVehicledemandsDto dto, CrmVehicledemand crmVehicledemand) {
ResultBean<CrmVehicledemand> rb = ResultBean.fireFail();
//如果是全款且自有资金的，需要删除金融方案
String purchaseMethod = dto.getPurchaseMethod();
if ("1".equals(purchaseMethod)) {//全款
if ("1".equals(dto.getFinancePlan())) {//自有资金
crmVehicledemand.setType(null);
crmVehicledemand.setTypeKey(null);
loanSolutionsFeign.deleteByOrderSid(crmVehicledemand.getSid());
} else {//三方金融
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions solutions = dto.getCrmSolutions();
if (solutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(solutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(crmVehicledemand.getSid());
if ("2".equals(dto.getFinancePlan())) {
solutionsDto.setShowMore(false);
}
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
}
} else {
crmVehicledemand.setType(null);
crmVehicledemand.setTypeKey(null);
loanSolutionsFeign.deleteByOrderSid(sid);
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
}
} else {//贷款
//新增客户的金融方案
if(StringUtils.isNotBlank(dto.getTypeKey())){
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions();
if (crmSolutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
} else {
loanSolutionsFeign.deleteByOrderSid(sid);
}
} else {//贷款
if (StringUtils.isNotBlank(dto.getTypeKey())) {
if ("1".equals(dto.getTypeKey())) {//资方常规
CrmSolutions crmSolutions = dto.getCrmSolutions();
if (crmSolutions != null) {
SolutionssDto solutionsDto = new SolutionssDto();
BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
solutionsDto.setSaleOrderSid(crmVehicledemand.getSid());
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
} else {//定制金融
}
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
crmVehicledemand.setFinancePlan("4");//担保
crmVehicledemand.setFinancePlanValue("担保");//担保
} else {
crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
}
crmVehicledemand.setTypeKey("1");
crmVehicledemand.setType("资方常规");
} else {//定制金融
}
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(crmVehicledemand.getSid()).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
crmVehicledemand.setFinancePlan("4");//担保
crmVehicledemand.setFinancePlanValue("担保");//担保
} else {
crmVehicledemand.setFinancePlan("3");//自营非担保
crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
}
}else{
loanSolutionsFeign.deleteByOrderSid(sid);
crmVehicledemand.setTypeKey(null);
crmVehicledemand.setType(null);
}
} else {
loanSolutionsFeign.deleteByOrderSid(crmVehicledemand.getSid());
crmVehicledemand.setTypeKey(null);
crmVehicledemand.setType(null);
}
baseMapper.updateById(crmVehicledemand);
}
return rb.success();
return rb.success().setData(crmVehicledemand);
}
public ResultBean<CrmVehicledemandsVo> details(String sid) {

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java
View File

@ -27,4 +27,6 @@ public class SysUserInfoVo implements Vo {
@ApiModelProperty("员工的组织部门编码")
private String orgCode;
private String mobile;
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
View File

@ -207,7 +207,7 @@
</select>
<!--根据用户的sid查询用户的组织信息:多个时取第一个-->
<select id="selectUserInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode,su.mobile
FROM sys_user su
LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml
View File

@ -88,7 +88,7 @@
</select>
<select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo">
select lfp.policyName name,
select lfp.policyName name,
lfp.sid,
lfp.downPayRatio,
lfp.downPayRatioKey,
@ -97,18 +97,19 @@
lfp.bondRatio,
lfp.bondRatioKey,
lfp.yearRatio,
lfp.serviceAmountTypeKey as serviceChargeTypeKey,
lfp.serviceAmount as serviceChargeTypeValue,
lfp.depositPremium,
lfp.depositSettle,
lfp.nominalPrice
lfp.serviceAmountTypeKey as serviceChargeTypeKey,
lfp.serviceAmount as serviceChargeTypeValue,
lfp.depositPremium,
lfp.depositSettle,
lfp.nominalPrice,
lfp.vehAccidentAmount
from loan_fin_policy lfp
where lfp.filingState = 1
and isPack = #{isPack}
and lfp.useOrgSid = #{useOrgSid}
and lfp.validDateTo > now()
<if test="name != null and name != ''">
and lfp.policyName like concat('%',#{name},'%')
and lfp.policyName like concat('%', #{name}, '%')
</if>
</select>
</mapper>

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

@ -1374,6 +1374,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
downPayAmountsRatio = downPayAmountsRatio.setScale(0, BigDecimal.ROUND_HALF_UP);
calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString());
//
BigDecimal downPayRatioLeast = loanFinPolicy.getDownPayRatioLeast();
if(downPayAmountsRatio.compareTo(downPayRatioLeast)<0){
return rb.setMsg("实际首付比例不能低于产品政策中的最低首付比例");
}
//总贷款金额
calculateVo.setLoanAmountTotal(loanAmountTotal.setScale(0, BigDecimal.ROUND_HALF_UP).toString());
//期数

Write Preview
Loading…
Cancel
Save