From bb13e0d7cc70759ba2f617b5d189a2bc85090d4f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 28 Aug 2023 16:20:25 +0800 Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E5=AE=A2=E6=88=B7=E6=B4=BD=E8=B0=88?= =?UTF-8?q?=E9=87=91=E8=9E=8D=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateEnum.java | 2 +- .../BaseVehicleStateService.java | 4 +- .../BusDeliveredApplyMapper.xml | 2 +- .../BusDeliveredApplyService.java | 8 +- .../crmvehicledemand/CrmVehicledemand.java | 3 + .../CrmVehicledemandFeign.java | 23 ++++-- .../CrmVehicledemandFeignFallback.java | 16 +++- .../CrmVehicledemandsDto.java | 4 - .../crmvehicledemand/CrmVehicledemandsVo.java | 58 ++++++++++++++ .../CrmVehicledemandMapper.java | 6 +- .../CrmVehicledemandMapper.xml | 4 +- .../CrmVehicledemandRest.java | 20 +++-- .../CrmVehicledemandService.java | 76 +++++++++++++++---- 13 files changed, 179 insertions(+), 47 deletions(-) create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index 8c62b8f712..716735e7fe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -84,7 +84,7 @@ public class BaseVehicleStateEnum { TC("14", "退车"), JCZBTIJ("15", "交车准备提交"), JCTJ("16", "交车提交"), - CKKP_SAVE("17", "出库申请保存"), +// CKKP_SAVE("17", "出库申请保存"), CKKP_DELETE("18", "出库申请修改"), QKKPTJ("19","欠款开票提交"), QKKPZZ("20","欠款开票终止"), diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 097668db5a..a26c195b9c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -91,9 +91,9 @@ public class BaseVehicleStateService extends MybatisBaseService #{item} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 9678bfcb0e..69e8c1685a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -2111,7 +2111,7 @@ public class BusDeliveredApplyService extends MybatisBaseService stateDtoList = new ArrayList<>(); + /* List stateDtoList = new ArrayList<>(); List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); vinSidList.removeAll(Collections.singleton(null)); if (!vinSidList.isEmpty()) { @@ -2122,7 +2122,7 @@ public class BusDeliveredApplyService extends MybatisBaseService(); + /* stateDtoList = new ArrayList<>(); vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); vinSidList.removeAll(Collections.singleton(null)); if (!vinSidList.isEmpty()) { @@ -2299,7 +2299,7 @@ public class BusDeliveredApplyService extends MybatisBaseService> listPage(@RequestBody PagerQuery pq); - @ApiOperation("根据条件查询所有数据列表") + /* @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody CrmVehicledemandQuery query); @ApiOperation("所有数据列表") @GetMapping("/list") - public ResultBean> list(); + public ResultBean> list();*/ /** * 意向车型新增保存 @@ -72,9 +72,9 @@ public interface CrmVehicledemandFeign { * @param sid 意向车型的sid * @return */ - @ApiOperation("修改保存") + /* @ApiOperation("修改保存") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody CrmVehicledemandDto dto, @PathVariable("sid") String sid); + public ResultBean update(@RequestBody CrmVehicledemandDto dto, @PathVariable("sid") String sid);*/ /** * 意向车型的批量删除 @@ -82,7 +82,7 @@ public interface CrmVehicledemandFeign { * @param sid * @return */ - @ApiOperation("删除记录") + /* @ApiOperation("删除记录") @GetMapping("/del/{sid}") public ResultBean del(@PathVariable("sid") String sid); @@ -90,15 +90,24 @@ public interface CrmVehicledemandFeign { @GetMapping("/fetch/{id}") public ResultBean fetch(@PathVariable("id") String id); + */ + /** * 意向车型的编辑回显 * * @param sid * @return - */ + *//* @ApiOperation("获取一条记录") @GetMapping("/fetchSid/{sid}") - public ResultBean fetchSid(@PathVariable("sid") String sid); + public ResultBean fetchSid(@PathVariable("sid") String sid);*/ + @ApiOperation("详情、编辑初始化") + @GetMapping("/details") + ResultBean details(@RequestParam("sid") String sid); + + @ApiOperation("删除/批量删除") + @DeleteMapping("/deleteAll") + ResultBean deleteAll(@RequestBody String[] sids); /********************************** App接口 *********************************/ diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java index 9afe38e1b8..d6a0d9ca7d 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java @@ -31,7 +31,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { return rb.setMsg("接口anrui-crm/crmvehicledemand/listPage无法访问"); } - @Override + /* @Override public ResultBean> listAll(CrmVehicledemandQuery query) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-crm/crmvehicledemand/listAll无法访问"); @@ -41,7 +41,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { public ResultBean> list() { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-crm/crmvehicledemand/list无法访问"); - } + }*/ @Override public ResultBean save(CrmVehicledemandDto dto) { @@ -54,6 +54,16 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { } @Override + public ResultBean details(String sid) { + return null; + } + + @Override + public ResultBean deleteAll(String[] sids) { + return null; + } + + /* @Override public ResultBean update(CrmVehicledemandDto dto, String sid) { return ResultBean.fireFail().setMsg("接口anrui-crm/crmvehicledemand/update无法访问"); } @@ -72,7 +82,7 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { @Override public ResultBean fetchSid(String sid) { return null; - } + }*/ @Override public ResultBean delBySid(String sid) { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java index 952062211f..6815b73605 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java @@ -60,9 +60,5 @@ public class CrmVehicledemandsDto implements Dto { private String financePlan; @ApiModelProperty("金融方案value") private String financePlanValue; - @ApiModelProperty("客户类型") - private String customerType; - @ApiModelProperty("客户类型key") - private String customerTypeKey; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsVo.java new file mode 100644 index 0000000000..76cd6a3759 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsVo.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.crm.api.crmvehicledemand; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/28 + **/ +@Data +public class CrmVehicledemandsVo { + + @ApiModelProperty("车辆需求sid") + private String sid; + private String customerSid; + @ApiModelProperty("购车方式") + private String purchaseMethod; + @ApiModelProperty("购车方式Value") + private String purchaseMethodValue; + @ApiModelProperty("资金来源、担保类型") + private String type; + @ApiModelProperty("资金来源、担保类型key") + private String typeKey; + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("品牌sid") + private String brandSid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("常用配置sid") + private String comonConfigSid; + @ApiModelProperty("常用配置") + private String sketChconfiguration; + @ApiModelProperty("其它配置说明") + private String otherConfig; + @ApiModelProperty("换选装内容") + private String changeOptions; + @ApiModelProperty("预计提车日期") + private String estimatedPickupDate; + @ApiModelProperty("销售参考价") + private String saleReferencePrice; + + @ApiModelProperty("车型报价") + private String vehicleModelOffer; + @ApiModelProperty("数量") + private String number; + @ApiModelProperty("备注") + private String remarks; + + private CrmSolutions crmSolutions = new CrmSolutions(); + @ApiModelProperty("金融方案key") + private String financePlan; + @ApiModelProperty("金融方案value") + private String financePlanValue; +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java index 9d225b83e8..a3c6d1b038 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java @@ -35,10 +35,10 @@ public interface CrmVehicledemandMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); +// List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from crm_vehicledemand") - List selectListVo(); + /* @Select("select * from crm_vehicledemand") + List selectListVo();*/ List fetchByCustomerSid(String customerSid); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 3ee657a2c2..29caf87c55 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -11,13 +11,13 @@ - SELECT * diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java index b09d8ce247..97e9a6e425 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java @@ -44,7 +44,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { return rb.success().setData(pv); } - @Override + /* @Override public ResultBean> listAll(@RequestBody CrmVehicledemandQuery query) { ResultBean rb = ResultBean.fireFail(); List list = crmVehicledemandService.listAllVo(query); @@ -56,7 +56,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { ResultBean rb = ResultBean.fireFail(); List list = crmVehicledemandService.listVo(); return rb.success().setData(list); - } + }*/ @Override public ResultBean save(CrmVehicledemandDto dto) { @@ -68,14 +68,24 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { return crmVehicledemandService.save2(dto); } + @Override + public ResultBean details(String sid) { + return crmVehicledemandService.details(sid); + } + + @Override + public ResultBean deleteAll(String[] sids) { + return crmVehicledemandService.deleteAll(sids); + } +/* @Override public ResultBean update(CrmVehicledemandDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); crmVehicledemandService.updateAllBySid(dto, sid); return rb.success(); - } + }*/ - @Override + /* @Override public ResultBean del(String sid) { ResultBean rb = ResultBean.fireFail(); crmVehicledemandService.delAll(sid); @@ -94,7 +104,7 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { ResultBean rb = ResultBean.fireFail(); CrmVehicledemandVo vo = crmVehicledemandService.fetchAllBySid(sid); return rb.success().setData(vo); - } + }*/ @Override public ResultBean delBySid(String sid) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 7e5306d550..733c291507 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -21,7 +21,9 @@ import com.yxt.anrui.crm.biz.crmvehiclefinance.CrmVehicleFinanceService; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssDto; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateSolutionsVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -29,11 +31,13 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -72,19 +76,19 @@ public class CrmVehicledemandService extends MybatisBaseService listPage(PagerQuery pq) { +/* public PagerVo listPage(PagerQuery pq) { CrmVehicledemandQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; - } + }*/ - public List listAll(CrmVehicledemandQuery query) { + /* public List listAll(CrmVehicledemandQuery query) { QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectList(qw); - } + }*/ private QueryWrapper createQueryWrapper(CrmVehicledemandQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -129,27 +133,27 @@ public class CrmVehicledemandService extends MybatisBaseService listAllVo(CrmVehicledemandQuery query) { + /* public List listAllVo(CrmVehicledemandQuery query) { QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); - } + }*/ - public List listVo() { + /* public List listVo() { return baseMapper.selectListVo(); - } + }*/ - public void saveOrUpdateDto(CrmVehicledemandDto dto) { + /* public void saveOrUpdateDto(CrmVehicledemandDto dto) { CrmVehicledemand entity = new CrmVehicledemand(); dto.fillEntity(entity); this.saveOrUpdate(entity); - } + }*/ - public CrmVehicledemandVo fetchByIdVo(String id) { + /* public CrmVehicledemandVo fetchByIdVo(String id) { CrmVehicledemand entity = this.fetchById(id); CrmVehicledemandVo vo = new CrmVehicledemandVo(); BeanUtil.copyProperties(entity, vo); return vo; - } + }*/ public List fetchByCustomerSid(String customerSid) { return baseMapper.fetchByCustomerSid(customerSid); @@ -284,7 +288,7 @@ public class CrmVehicledemandService extends MybatisBaseService getVisitListSid(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); @@ -521,8 +525,10 @@ public class CrmVehicledemandService extends MybatisBaseService details(String sid) { + CrmVehicledemandsVo crmVehicledemandsVo = new CrmVehicledemandsVo(); + ResultBean rb = ResultBean.fireFail(); + CrmVehicledemand crmVehicledemand = fetchBySid(sid); + if (crmVehicledemand == null) { + return rb.setMsg("该车辆需求不存在"); + } + BeanUtil.copyProperties(crmVehicledemand, crmVehicledemandsVo); + if (!"1".equals(crmVehicledemand.getTypeKey())) { + ResultBean solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailByApplySid(sid); + if (solutionsDetailsVoResultBean.getData() != null) { + CrmSolutions loanTemplateSolutionsVo = new CrmSolutions(); + BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), loanTemplateSolutionsVo); + if ("2".equals(crmVehicledemandsVo.getTypeKey())) { + loanTemplateSolutionsVo.setShowMore(false); + } else if ("3".equals(crmVehicledemandsVo.getTypeKey()) || "4".equals(crmVehicledemandsVo.getTypeKey())) { + loanTemplateSolutionsVo.setShowMore(true); + } + crmVehicledemandsVo.setCrmSolutions(loanTemplateSolutionsVo); + } + } + return rb.success().setData(crmVehicledemandsVo); + } + + public ResultBean deleteAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + List sidsList = Arrays.asList(sids); + if (sidsList.size() == 0) { + return rb.setMsg("请选择要删除的数据"); + } + for (int i = 0; i < sidsList.size(); i++) { + String sid = sidsList.get(i); + baseMapper.delBySid(sid); + loanSolutionsFeign.deleteByOrderSid(sid); + } + return rb.success(); + } } \ No newline at end of file