From fd7e90e5ddd197afbb220e43f9729bf5667ea115 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sat, 16 May 2020 16:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kiisoo/ic/job/DTOMessageHandler.java    | 12 ++++++++++--
 .../ic/store/mapper/PoiStoreStaffDOMapper.java       |  5 ++++-
 .../ic/wx/service/QWMailListManageService.java       |  2 +-
 .../mapper/PrivilageUserShopRelationDOMapper.xml     |  4 ++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
index 5e9be15..5463472 100644
--- a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
+++ b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
@@ -16,7 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 @Slf4j
@@ -39,6 +41,12 @@ public class DTOMessageHandler implements EventHandler<DTOMessage> {
         PoiStoreStaffDOMapper poiStoreStaffDOMapper = dtoMessage.getPoiStoreStaffDOMapper();
         QWMailListManageService qwMailListManageService = dtoMessage.getQwMailListManageService();
         PrivilageCpUserStoreDO cpUserStoreDO = dtoMessage.getPrivilageCpUserStoreDO();
+        List<Map<String,Object>> tagList = poiStoreStaffDOMapper.selectStaffTagByStoreId(cpUserStoreDO.getStoreId());
+        Map<String,Long> tagMap = new HashMap<>();
+        for (Map<String,Object> map:tagList){
+            tagMap.put((String)map.get("tag"),(Long)map.get("staffId"));
+        }
+
         List<WxCpUserExternalContactInfo> customers = null;
         try {
             customers = qwMailListManageService.getCustomer(cpUserId);
@@ -63,14 +71,14 @@ public class DTOMessageHandler implements EventHandler<DTOMessage> {
                         if (StringUtils.isNotBlank(state)){
                             //判断是否有导购码
                             turnBackDTO.setEaCode(state);
-                        }else if(tags != null && tags.length > 0){
+                        }else if(tags != null && tags.length > 0 && tagList != null && tagList.size() > 0){
                             //判断是否有打tag
                             //todo 根据tag获取导购码
                             for (int j = 0;j<tags.length;j++){
                                 String groupName = tags[j].getGroupName();
                                 if ("导购".equals(groupName)){
                                     String tagName = tags[j].getTagName();
-                                    Long staffId = poiStoreStaffDOMapper.selectStaffIdByTag(cpUserStoreDO.getStoreId(), tagName);
+                                    Long staffId = tagMap.get(tagName);
                                     if (staffId != null){
                                         PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectById(staffId);
                                         if (poiStoreStaff!=null){
diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java
index 100573e..d46a82b 100644
--- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java
@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 账号  Mapper 接口
@@ -56,7 +57,9 @@ public interface PoiStoreStaffDOMapper extends BaseMapper<PoiStoreStaff> {
 
     Long selectStaffIdByUserId(@Param("userId") Long userId);
 
-    Long selectStaffIdByTag(@Param("storeId") Long store,@Param("tag") String tag);
+    Long selectStaffIdByTag(@Param("storeId") Long storeId,@Param("tag") String tag);
+
+    List<Map<String,Object>> selectStaffTagByStoreId(@Param("storeId") Long storeId);
 
     String selectUserNameById(@Param("id") Long id);
 
diff --git a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
index 42f0141..e262f0c 100644
--- a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
+++ b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
@@ -291,7 +291,7 @@ public class QWMailListManageService {
         List<WxCpUserExternalContactInfo> customers = null;
         wxCpService = WxCpConfiguration.getCpService(applicationid);
         WxCpExternalContactService externalContactService = wxCpService.getExternalContactService();
-        List<String> customerStrs = privilageCpUserDOMapper.selectCustomerIdsByCpUserId(cpUserId);
+        List<String> customerStrs = externalContactService.listExternalContacts(cpUserId);
         //查询客户列表为空则直接返回
         if (CollectionUtils.isNotEmpty(customerStrs)){
             customers = new ArrayList<>();
diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml
index a4d57d8..c09f5ba 100644
--- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml
@@ -66,6 +66,10 @@
         limit 1
     </select>
 
+    <select id="selectStaffTagByStoreId" resultType="java.util.Map">
+        select staff_id as staffId,tag from poi_store_staff_tag where store_id = #{storeId}
+    </select>
+
     <select id="selectUserNameById" resultType="java.lang.String">
         select IFNULL(t5.name, '') from poi_store_staff t4,
                             privilage_user t5 where  t4.user_id = t5.id and t4.id  = #{id}