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 e27b50ee7b..73b7249503 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 @@ -166,6 +166,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUser; 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; @@ -2161,8 +2162,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { if (StringUtils.isNotBlank(query.getUserSid())) { - SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData(); + SysUser sysUser = sysUserFeign.fetchBySidWx(query.getUserSid()).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); qw.eq("bo.customerSid", crmCustomerTempVo.getSid()); } qw.eq("bo.nodeState", "已办结"); 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 8e73a14f7c..f463957475 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 @@ -160,6 +160,10 @@ public interface CrmCustomerTempFeign { @PostMapping("/saveOrUpdateAppCustomerTemp") public ResultBean saveOrUpdateAppCustomerTemp(@Valid @RequestBody AppCrmCustomerTempDto dto); + @ApiOperation("小程序保存/修改潜在客户信息") + @PostMapping("/saveOrUpdateAppCustomerTempWx") + public ResultBean saveOrUpdateAppCustomerTempWx(@Valid @RequestBody AppCrmCustomerTempDto dto); + @ApiOperation("手机端维护客户信息是否完善的状态") @ResponseBody @GetMapping("/getAppCrmCustomerTempMaintainState") @@ -182,6 +186,11 @@ public interface CrmCustomerTempFeign { @GetMapping("/customerTempDetailsBySid/{sid}") public ResultBean customerTempDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("小程序客户信息维护详情") + @ResponseBody + @GetMapping("/customerTempDetailsBySidWx/{sid}") + public ResultBean customerTempDetailsBySidWx(@PathVariable("sid") String sid); + @ApiOperation("初始化客户详情") @ResponseBody @GetMapping("/getAppCustomerTempDetails") diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index cc566b8b65..f35643b6ed 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -110,6 +110,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return rb.setMsg("接口anrui-crm/crmcustomertemp/saveOrUpdateAppCustomerTemp无法访问"); } + @Override + public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) { + return null; + } + @Override public ResultBean getAppCrmCustomerTempMaintainState(String sid, String userSid) { return null; @@ -140,6 +145,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean customerTempDetailsBySidWx(String sid) { + return null; + } + @Override public ResultBean initCustomerArchives(String customerSid, String userSid) { return null; diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 03ea733774..45df5fb6f8 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -217,6 +217,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveOrUpdateAppCustomerTemp(dto); } + @Override + public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) { + return crmCustomerTempService.saveOrUpdateAppCustomerTempWx(dto); + } + /** * 手机端维护客户信息是否完善的状态 * @@ -301,6 +306,12 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return new ResultBean().success().setData(vo); } + @Override + public ResultBean customerTempDetailsBySidWx(String sid) { + AppCrmCustomerTempBasicsDetailsVo vo = crmCustomerTempService.customerTempDetailsBySidWx(sid); + return new ResultBean().success().setData(vo); + } + /** * 初始化客户档案信息 * 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 9953b4abae..e6088f935a 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 @@ -127,6 +127,7 @@ public class CrmCustomerTempService extends MybatisBaseService listPage(PagerQuery pq) { CrmCustomerTempQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -372,6 +373,53 @@ public class CrmCustomerTempService extends MybatisBaseService crmFileDetailsVos = crmFileService.fetchByLinkSid(sid); + List list = new ArrayList<>(); + if (crmFileDetailsVos != null) { + for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) { + String filePath = crmFileDetailsVo.getFilePath(); + list.add(fileUploadComponent.getUrlPrefix() + filePath); + } + } + vo.setCrmVisitFileList(list); + return vo; + } + public CrmCustomerTempVo selByMobile(String mobile) { return baseMapper.selByMobile(mobile); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java index d406771510..4c1f1b154f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java @@ -107,14 +107,14 @@ public class BaseSupplierTypeService extends MybatisBaseService 0){ - return rb.setMsg("新增编码已存在,请重新输入"); + return rb.setMsg("类型编码已存在,请重新输入"); } this.insertByDto(dto); return rb.success(); } int i = baseMapper.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid); if (i > 0){ - return rb.setMsg("修改编码已存在,请重新输入"); + return rb.setMsg("类型编码已存在,请重新输入"); } this.updateByDto(dto); return rb.success();