diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java index 06f36f1c76..5e72aad7b4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java @@ -80,5 +80,7 @@ public class AppBusSaleOrderStateVo implements Vo { @ApiModelProperty("上装的采购类型是否允许修改") private boolean isMain; + @ApiModelProperty("是否有金融方案按钮") + private boolean financeState; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 5d15657329..e3c7a40919 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -140,6 +140,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -256,6 +258,9 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetails(saleOrderSid); + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + if (solutionsDetailsVo == null) { + vo.setFinanceInfoState(0); + } else { + vo.setFinanceInfoState(1); + } + //补充说明状态 if (StringUtils.isNotBlank(busSalesOrder.getNotes()) || StringUtils.isNotBlank(busSalesOrder.getImagesFile())) { vo.setRemarksStete(1); @@ -1481,22 +1501,22 @@ public class BusSalesOrderService extends MybatisBaseService vinSids = new ArrayList<>(); - if (modelInfo != null){ + if (modelInfo != null) { List vinListsVos = modelInfo.getVinListsVos(); for (VinListsVo vinListsVo : vinListsVos) { - if (StringUtils.isNotBlank(vinListsVo.getVinSid())){ + if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { vinSids.add(vinListsVo.getVinSid()); } } } - if (vinSids.size() > 0){ + if (vinSids.size() > 0) { int i = busHandoverService.selectByCount(record.getContractId(), vinSids); if (record.isShowStopBtn() && i < vinSids.size()) { record.setShowStopBtn(true); } else { record.setShowStopBtn(false); } - }else { + } else { record.setShowStopBtn(false); } if (StringUtils.isNotBlank(record.getCustomerImage())) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index 1f0859902b..3ee99685ee 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.crm.biz.crmcustomertemp; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -53,8 +54,6 @@ public interface CrmCustomerTempMapper extends BaseMapper { * 手机端获取客户管理列表 * * @param page - * @param staffSid - * @param name * @return */ IPage getCustomerTempListByUserSid(IPage page, @Param(Constants.WRAPPER) Wrapper qw); @@ -118,7 +117,7 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selByMobile(@Param("mobile") String mobile); - List selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid); + List selectCustomerList(@Param(Constants.WRAPPER) QueryWrapper qw); CrmCustomerTempVo selectNo(String customerNo); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 8c68636a41..9221799df6 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -203,8 +203,9 @@ + select * + from loan_solutions + where salesOrderSid = #{saleOrderSid} + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java index 9309a7f9aa..635205dccd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java @@ -1,6 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loansolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,6 +30,16 @@ public class LoanSolutionsRest implements LoanSolutionsFeign { @Autowired private LoanSolutionsService loanSolutionsService; + @Override + public ResultBean selectDetails(String saleOrderSid) { + return loanSolutionsService.selectDetails(saleOrderSid); + } + + @Override + public ResultBean save(SolutionsDto dto) { + return loanSolutionsService.saveDto(dto); + } + /* @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 543d69040d..a852eab254 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1,7 +1,16 @@ package com.yxt.anrui.riskcenter.biz.loansolutions; +import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; +import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; +import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService; +import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -19,6 +28,60 @@ import org.springframework.stereotype.Service; */ @Service public class LoanSolutionsService extends MybatisBaseService { + + @Autowired + private LoanSolutionsOtherpolicyService loanSolutionsOtherpolicyService; + @Autowired + private LoanSolutionsDetailService loanSolutionsDetailService; + + public ResultBean selectDetails(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo(); + LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid); + BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo); + return rb.success().setData(solutionsDetailsVo); + } + + public ResultBean saveDto(SolutionsDto dto) { + ResultBean rb = ResultBean.fireFail(); + //验证必填 + //融资项目总额 + //首付比例 + //首付金额 = 首付比例*融资项目总额 + //产品贷款金额 = 融资项目总额-首付比例 + //贷款保证金比例 + //贷款保证金 = 贷款金额*保证金比例 + //厂家贴息 + //年利率计算 + //月还金额计算 + //利息总额计算 + + //查询金融方案 + String saleOrderSid = dto.getSaleOrderSid(); + LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid); + if (loanSolutions == null) { + loanSolutions = new LoanSolutions(); + BeanUtil.copyProperties(dto, loanSolutions); + baseMapper.insert(loanSolutions); + //其他融 + LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy(); + loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid()); + BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy); + //费用明细 + LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail(); + loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid()); + BeanUtil.copyProperties(dto, loanSolutionsDetail); + loanSolutionsDetailService.insert(loanSolutionsDetail); + loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy); + } else { + //修改其他融 + //修改费用明细 + // + + } + + return null; + } /* @Autowired private LoanSolutionsTopService loanSolutionsTopService; @Autowired @@ -529,7 +592,7 @@ public class LoanSolutionsService extends MybatisBaseService