From 90f0c34b78496f43d6ceac75ed36178b2d3a79bc Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 9 May 2022 19:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomertemp/CrmCustomerTempFeign.java | 4 +- .../CrmVehicledemandFeign.java | 5 +++ .../CrmVehicledemandFeignFallback.java | 5 +++ .../crmcustomerfile/CrmCustomerFileMapper.xml | 7 +-- .../CrmCustomerFileService.java | 40 ++++++++++------- .../CrmCustomerTempMapper.java | 3 +- .../crmcustomertemp/CrmCustomerTempMapper.xml | 28 +++++++----- .../CrmCustomerTempService.java | 43 ++++++++++++++++--- .../CrmVehicledemandMapper.java | 9 ++++ .../CrmVehicledemandMapper.xml | 23 +++++++--- .../CrmVehicledemandRest.java | 7 +++ .../CrmVehicledemandService.java | 38 ++++++++++++++++ 12 files changed, 166 insertions(+), 46 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index dd3febc774..67366b4b2f 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -132,8 +132,8 @@ public interface CrmCustomerTempFeign { @ApiOperation("初始化客户详情基础信息详情") @ResponseBody - @GetMapping("/getAppCustomerTempDetailsBySid") - public ResultBean getAppCustomerTempDetailsBySid(@RequestParam("sid") String sid); + @GetMapping("/getAppCustomerTempDetailsBySid/{sid}") + public ResultBean getAppCustomerTempDetailsBySid(@PathVariable("sid") String sid); @ApiOperation("初始化客户档案") @ResponseBody diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java index 5cf6cf0f3f..b533b457a4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java @@ -144,4 +144,9 @@ public interface CrmVehicledemandFeign { ResultBean> selectPagePc(@RequestBody PagerQuery pcCrmVehicleDemandQuery); + @ApiOperation("App销售订单选择意向车型列表") + @ResponseBody + @PostMapping("/init/wantCarList") + ResultBean> getWantCarList(@RequestBody PagerQuery pagerQuery); + } \ No newline at end of file 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 1b026e42e3..a3f10d8866 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 @@ -89,6 +89,11 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { return null; } + @Override + public ResultBean> getWantCarList(PagerQuery pagerQuery) { + return null; + } + //app diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml index 664a288900..a6e794f234 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml @@ -23,9 +23,10 @@ diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java index 47dc25d18e..0ae9db2cd2 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java @@ -135,7 +135,13 @@ public class CrmCustomerFileService extends MybatisBaseService data = bean.getData(); for (BaseDataListVo datum : data) { CrmCustomerFile crmCustomerFile = new CrmCustomerFile(); - datum.fromEntity(crmCustomerFile); +// datum.fromEntity(crmCustomerFile); +// BeanUtil.copyProperties(datum,crmCustomerFile); + crmCustomerFile.setDataType(datum.getDataType()); + crmCustomerFile.setFileName(datum.getFileName()); + crmCustomerFile.setFileType(datum.getFileType()); + crmCustomerFile.setAttachType(datum.getAttachType()); + crmCustomerFile.setSortNo(datum.getSortNo()); crmCustomerFile.setLinkSid(customerSid); this.save(crmCustomerFile); } @@ -198,24 +204,28 @@ public class CrmCustomerFileService extends MybatisBaseService initCustomerArchives(String customerSid, String userSid) { ResultBean rb = ResultBean.fireFail(); - fetchByDataTypeKey(customerSid); AppCrmCustomerTempArchivesVo vo = new AppCrmCustomerTempArchivesVo(); List dataVos = baseMapper.selectByCustomerSid(customerSid); - for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { - String createTime = appCustomerArchivesDataVo.getCreateTime(); - Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd HH:mm:ss"); - long time = date.getTime(); - String s = String.valueOf(time); - appCustomerArchivesDataVo.setLastUploadTime(s); - String sid = appCustomerArchivesDataVo.getSid(); - List listVo = baseMapper.selArchivesFileImageBySid(sid); - List list = new ArrayList<>(); - for (CrmFile crmFile : listVo) { - String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); - list.add(url); + if (dataVos.size() > 0) { + for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { + String createTime = appCustomerArchivesDataVo.getCreateTime(); + Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd HH:mm:ss"); + long time = date.getTime(); + String s = String.valueOf(time); + appCustomerArchivesDataVo.setLastUploadTime(s); + String sid = appCustomerArchivesDataVo.getSid(); + List listVo = baseMapper.selArchivesFileImageBySid(sid); + List list = new ArrayList<>(); + for (CrmFile crmFile : listVo) { + String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); + list.add(url); + } + appCustomerArchivesDataVo.setFiles(list); } - appCustomerArchivesDataVo.setFiles(list); + } else { + fetchByDataTypeKey(customerSid); } + vo.setData(dataVos); return rb.success().setData(vo); } 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 bb8a60a2af..6e4bf6e0d3 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 @@ -60,7 +60,6 @@ public interface CrmCustomerTempMapper extends BaseMapper { IPage getCustomerTempListByUserSid(IPage page, @Param("staffSid") String staffSid, @Param("name") String name); - CrmCustomerTempVo selectByMobileOrWx(Map map); @Select("SELECT COUNT(1) FROM crm_customer_temp WHERE createOrgSid=#{orgSid}") @@ -113,4 +112,6 @@ public interface CrmCustomerTempMapper extends BaseMapper { * @return */ AppCrmCustomerTempInfoVo getAppCustomerTempDetailsBySid(@Param("sid") String sid); + + int selBySidAndMobile(@Param("sid") String sid, @Param("mobile") String mobile); } \ No newline at end of file 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 7f06e94a39..1bf47242aa 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 @@ -55,8 +55,7 @@ + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 2afed701f1..3dd53a5036 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -24,6 +24,7 @@ import com.yxt.anrui.crm.biz.crmfile.CrmFileService; import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService; import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -220,17 +221,28 @@ public class CrmCustomerTempService extends MybatisBaseService 0) { + return new ResultBean().fail().setMsg("该手机号已绑定其它客户，请重新添加"); + } } } + if (StringUtils.isNotBlank(dto.getWeixin())) { map.put("weixin", dto.getWeixin()); CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobileOrWx(map); if (crmCustomerTempVo != null && crmCustomerTempVo.getStaffSid().equals(userOrgInfoVo.getStaffSid())) { - return new ResultBean().fail().setMsg("该微信号已绑定其它客户，请重新添加"); + if (crmCustomerTempVo.getWeixin().equals(dto.getWeixin())) { + return new ResultBean().fail().setMsg("该微信号已绑定其它客户，请重新添加"); + } } } CrmCustomerTemp customerTemp = fetchBySid(dto.getSid()); @@ -398,7 +410,11 @@ public class CrmCustomerTempService extends MybatisBaseService paramMap = new HashMap<>(); @@ -776,8 +797,16 @@ public class CrmCustomerTempService extends MybatisBaseService crmFileDetailsVos = crmFileService.fetchByLinkSid(sid); List list = new ArrayList<>(); if (crmFileDetailsVos != null) { 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 2649390137..9a1ff25fe6 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 @@ -97,4 +97,13 @@ public interface CrmVehicledemandMapper extends BaseMapper { * @return */ IPage selectPagePc(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * App销售订单选择意向车型列表 + * + * @param page + * @param qw + * @return + */ + IPage getWantCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file 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 0feffc97c9..2c790205de 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 @@ -71,14 +71,14 @@ + + \ No newline at end of file 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 17d48ad743..e348ba3457 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 @@ -185,4 +185,11 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { PagerVo pv = crmVehicledemandService.selectPagePc(pcCrmVehicleDemandQuery); return rb.success().setData(pv); } + + @Override + public ResultBean> getWantCarList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = crmVehicledemandService.getWantCarList(pagerQuery); + return rb.success().setData(pv); + } } 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 4f2c294de5..ac472f770e 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 @@ -411,4 +411,42 @@ public class CrmVehicledemandService extends MybatisBaseService getWantCarList(PagerQuery pagerQuery) { + QueryWrapper qw = AppCreatePagePcWrapper(pagerQuery.getParams()); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getWantCarList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List list = p.getRecords(); + if (list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + //根据车型sid及配置sid查询单台指导价 + ResultBean voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelSid()); + if (voResultBean.getSuccess()) { + list.get(i).setGuidancePrice(voResultBean.getData().getGuidedPrice()); + } + } + } + return p; + } + + /** + * 构造查询条件 + * + * @param query 查询条件 + * @return + */ + private QueryWrapper AppCreatePagePcWrapper(AppCrmOrderVehicleDemandQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + qw.eq("cv.customerSid", query.getCustomerSid()); + } + return qw; + } } \ No newline at end of file