From 24d1baedf042c14bd56514dc09d1821b6279c125 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 26 Oct 2022 14:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7+=E4=B8=AD=E4=BB=8B=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=9A=E5=88=86=E5=85=AC=E5=8F=B8=E7=AE=80=E7=A7=B0+?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BC=96=E7=A0=81+=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D+=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E3=80=82=E5=AE=A2=E6=88=B7=E6=A0=B9=E6=8D=AE=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=AA=8C=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemiddleman/BaseMiddlemanService.java | 73 ++++++++++++++-- .../CrmCustomerTempMapper.java | 4 + .../crmcustomertemp/CrmCustomerTempMapper.xml | 15 +++- .../CrmCustomerTempService.java | 87 ++++++++++++------- 4 files changed, 141 insertions(+), 38 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java index eeefa0f38f..233fb16d83 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java @@ -29,6 +29,9 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemiddleman.*; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -65,6 +68,8 @@ public class BaseMiddlemanService extends MybatisBaseService listPageVo(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -90,7 +95,36 @@ public class BaseMiddlemanService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (staffOrgResultBean.getSuccess()) { + SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); + if (sysStaffOrg != null) { + ResultBean resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath()); + if (resultBean1.getSuccess()) { + String osid = resultBean1.getData(); + if (StringUtils.isNotBlank(osid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); + } + } + } + String orgSid1 = sysStaffOrg.getOrgSid(); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); + } + } + } + String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile(); baseMiddleman.setMiddleCode(middleCode); baseMapper.insert(baseMiddleman); } else { @@ -99,7 +133,36 @@ public class BaseMiddlemanService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (staffOrgResultBean.getSuccess()) { + SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); + if (sysStaffOrg != null) { + ResultBean resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath()); + if (resultBean1.getSuccess()) { + String osid = resultBean1.getData(); + if (StringUtils.isNotBlank(osid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); + } + } + } + String orgSid1 = sysStaffOrg.getOrgSid(); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); + } + } + } + String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile(); baseMiddleman.setMiddleCode(middleCode); baseMapper.updateById(baseMiddleman); } @@ -116,12 +179,12 @@ public class BaseMiddlemanService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { - if(StringUtils.isBlank(params.getOrgPath())){ + if (StringUtils.isBlank(params.getOrgPath())) { if (StringUtils.isNotBlank(params.getUserSid())) { ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()); qw.eq("useOrgSid", resultBean.getData()); } - }else{ + } else { String orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); qw.eq("useOrgSid", orgPath); } @@ -138,7 +201,7 @@ public class BaseMiddlemanService extends MybatisBaseService list = new ArrayList<>(); //查询用户sid ResultBean sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid); - if(sysUserVoResultBean.getSuccess()){ + if (sysUserVoResultBean.getSuccess()) { list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid()); } return rb.success().setData(list); 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 df506cdc41..b8d565d99f 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 @@ -119,4 +119,8 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selByMobile(@Param("mobile") String mobile); List selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid); + + CrmCustomerTempVo selectNo(String customerNo); + + CrmCustomerTempVo selectNo1(@Param("customerNo") String customerNo, @Param("sid") String sid); } \ 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 164573a16e..11dbec3a30 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 @@ -13,7 +13,7 @@ FROM crm_visit cvi WHERE cct.sid = cvi.customerSid) gjcounts FROM crm_customer_temp cct - LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid + LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid ${ew.sqlSegment} @@ -211,4 +211,17 @@ where createOrgSid = #{orgSid} and staffSid = #{staffSid} + + + + \ 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 ec9e4887a3..38b1710f57 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 @@ -236,8 +236,11 @@ public class CrmCustomerTempService extends MybatisBaseService 0) { return new ResultBean().fail().setMsg("该手机号已绑定其它客户，请重新添加"); } - } + }*/ } // if (StringUtils.isNotBlank(dto.getWeixin())) { // AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid()); @@ -832,7 +841,10 @@ public class CrmCustomerTempService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVo.getStaffSid()); if (staffOrgResultBean.getSuccess()) { SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); @@ -916,7 +928,7 @@ public class CrmCustomerTempService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(staffSid); + if (staffOrgResultBean.getSuccess()) { + SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); + if (sysStaffOrg != null) { + ResultBean resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath()); + if (resultBean1.getSuccess()) { + String osid = resultBean1.getData(); + if (StringUtils.isNotBlank(osid)) { + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); + } + } + } + String orgSid1 = sysStaffOrg.getOrgSid(); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1); + if (sysOrganizationVoResultBean.getSuccess()) { + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); + } + } + } + customerNoPrefix = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(name) + mobile; + return customerNoPrefix; + } + private Map genetrateCustomerNumO(String customerTypeKey, SysUserInfoVo sysUserInfoVo) { // 流水号 int i = selectCountByOrgSid(sysUserInfoVo.getOrgCode()); @@ -977,7 +1019,9 @@ public class CrmCustomerTempService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(customerTemp.getStaffSid()); - if (staffOrgResultBean.getSuccess()) { - SysStaffOrg sysStaffOrg = staffOrgResultBean.getData(); - if (sysStaffOrg != null) { - ResultBean resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath()); - if (resultBean1.getSuccess()) { - String osid = resultBean1.getData(); - if (StringUtils.isNotBlank(osid)) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid); - if (sysOrganizationVoResultBean.getSuccess()) { - SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); - customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre(); - } - } - } - String orgSid1 = sysStaffOrg.getOrgSid(); - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1); - if (sysOrganizationVoResultBean.getSuccess()) { - SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); - customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode(); - } - } - } - String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile(); + String customerNo = getPrefix(staffSid, dto.getName(), dto.getMobile()); +// CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectNo(customerNo); +// String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile(); customerTemp.setCustomerNo(customerNo); baseMapper.updateById(customerTemp); //更新运营信息