From 8f91bde52ae8cbdb8baccc2651cb4d266d928e3b Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Fri, 30 Jun 2023 19:34:24 +0800 Subject: [PATCH 1/6] queryPartnerIntentInfo --- .../cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index cc4760fce..d53f15666 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -267,6 +267,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic @Override public PartnerIntentInfoVO queryPartnerIntentInfo(PartnerUserInfoVO userInfoVO, Long lineId) { + log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo userInfoVO:{}", JSONObject.toJSONString(userInfoVO)); + String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); From 9aab961f9fe8223d735f2d690a6518a3863b89f6 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Fri, 30 Jun 2023 19:36:40 +0800 Subject: [PATCH 2/6] intentInfoVO --- .../cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index d53f15666..06d85d45f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -291,6 +291,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); } intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); + log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo intentInfoVO:{}", JSONObject.toJSONString(intentInfoVO)); + return intentInfoVO; } From 3a31cc13504101d6e6538b8f9f1b6c2127f89e9a Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 30 Jun 2023 20:12:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/EnterpriseUserMapper.xml | 10 ++++++++-- .../cool/store/dto/enterprise/EnterpriseUserDTO.java | 8 ++++++-- .../store/service/impl/EnterpriseSyncServiceImpl.java | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 5184d40b7..d350e9a30 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -161,8 +161,14 @@ ON DUPLICATE KEY UPDATE user_id = values(user_id), name = values(name), remark = values(remark), mobile = values(mobile), email = values(email), org_email = values(org_email) - , main_admin = values(main_admin), is_admin = values(is_admin), unionid = values(unionid), avatar = values(avatar), jobnumber = values(jobnumber), is_leader = values(is_leader) - , leader_dept_ids = values(leader_dept_ids), face_url = values(face_url), user_status = values(user_status), user_region_ids = values(user_region_ids), deleted = values(deleted) + , main_admin = values(main_admin), is_admin = values(is_admin), unionid = values(unionid), avatar = values(avatar), jobnumber = values(jobnumber) + , face_url = values(face_url), user_status = values(user_status), user_region_ids = values(user_region_ids), deleted = values(deleted) + + , is_leader = values(is_leader) + + + , leader_dept_ids = values(leader_dept_ids) + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java index 98e7b8458..2db6627f7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java @@ -2,6 +2,7 @@ package com.cool.store.dto.enterprise; import com.alibaba.fastjson.JSONObject; import com.cool.store.entity.EnterpriseUserDO; +import com.cool.store.enums.FSEventTypeEnum; import com.cool.store.enums.UserStatusEnum; import com.cool.store.utils.UUIDUtils; import com.google.common.collect.Lists; @@ -142,7 +143,7 @@ public class EnterpriseUserDTO implements Serializable { } - public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map regionPathMap, Multimap leaderDeptMap) { + public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map regionPathMap, Multimap leaderDeptMap, FSEventTypeEnum eventType) { EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO(); enterpriseUserDO.setId(UUIDUtils.get32UUID()); enterpriseUserDO.setUserId(user.getUserId()); @@ -157,7 +158,6 @@ public class EnterpriseUserDTO implements Serializable { enterpriseUserDO.setAvatar(user.getAvatar()); enterpriseUserDO.setJobnumber(user.getJobnumber()); enterpriseUserDO.setUserStatus(UserStatusEnum.NORMAL.getCode()); - enterpriseUserDO.setIsLeader(Boolean.FALSE); List departmentLists = user.getDepartmentLists(); List regionPaths = new ArrayList<>(); if(CollectionUtils.isNotEmpty(departmentLists)){ @@ -165,6 +165,10 @@ public class EnterpriseUserDTO implements Serializable { regionPaths.add(regionPathMap.get(departmentId)); } } + //创建的时候给个默认值 + if(FSEventTypeEnum.USER_CREATED.equals(eventType)){ + enterpriseUserDO.setIsLeader(Boolean.FALSE); + } Collection deptIds = leaderDeptMap.get(user.getUserId()); if(CollectionUtils.isNotEmpty(deptIds)){ enterpriseUserDO.setIsLeader(Boolean.TRUE); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java index fdebd0e79..f6f7992f3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java @@ -11,6 +11,7 @@ import com.cool.store.dto.enterprise.*; import com.cool.store.entity.*; import com.cool.store.enums.DataSourceEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.FSEventTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.http.ISVHttpRequest; import com.cool.store.service.EnterpriseSyncService; @@ -168,7 +169,8 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { @Override public void userUpdateEvent(UserEventDTO param) { - switch (parseValue(param.getEventType())){ + FSEventTypeEnum eventType = parseValue(param.getEventType()); + switch (eventType){ case USER_CREATED: case USER_UPDATED: EnterpriseUserDTO userDetail = isvHttpRequest.getUserDetailByUserId(param.getOpenId()); @@ -202,7 +204,7 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { }else{ enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId()); } - EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap); + EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap, eventType); enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser))); break; case USER_DELETED: From 530e40df2618f03a3937847e62b56b84c96279ba Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Fri, 30 Jun 2023 20:14:11 +0800 Subject: [PATCH 4/6] queryPartnerIntentInfo --- .../cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 06d85d45f..e53df2ac5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -272,6 +272,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); + intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); return intentInfoVO; } HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId); From 5f8460a06555975cc86e321155d0915de4ebf286 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 30 Jun 2023 20:16:00 +0800 Subject: [PATCH 5/6] update --- .../com/cool/store/controller/EnterpriseUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java index 79b32a704..17af44459 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java @@ -24,7 +24,7 @@ public class EnterpriseUserController { @ApiOperation("获取开发主管") @GetMapping("/getDevelopmentDirectorList") - public ResponseResult getDevelopmentDirectorList(@RequestParam("wantShopArea") String wantShopArea){ + public ResponseResult getDevelopmentDirectorList(@RequestParam(value = "wantShopArea",required = false) String wantShopArea){ return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea)); } From f53c63d9e77ef1569ba9c0a17c45af80310f3668 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Fri, 30 Jun 2023 20:48:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9ec=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/EcSyncServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index c70243c05..dfaf30931 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -132,7 +132,7 @@ public class EcSyncServiceImpl implements EcSyncService { String followUserName = customerInfoItem.getFollowUserName(); String followUserMobile = customerInfoItem.getFollowUserMobile(); //传递过来有跟进人的情况下查询跟进人是否存在 - if (StringUtil.isNotEmpty(followUserMobile)&&StringUtil.isNotEmpty(followUserMobile)) { + if (StringUtil.isNotEmpty(followUserMobile)&&StringUtil.isNotEmpty(followUserName)) { String userId = enterpriseUserDAO.selectByMobile("+86"+followUserMobile); if (StringUtil.isEmpty(userId)) { // 给飞书群发送消息 跟进人找不到