From 7339bfdb3a0be2bd4163aad88839f4dee01dfd38 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sun, 17 May 2020 09:20:49 +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

---
 .../ic/job/DTOMessageGroup1Consumer.java      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessageGroup1Consumer.java b/src/main/java/com/kiisoo/ic/job/DTOMessageGroup1Consumer.java
index 1f0f8ff..a7cac69 100644
--- a/src/main/java/com/kiisoo/ic/job/DTOMessageGroup1Consumer.java
+++ b/src/main/java/com/kiisoo/ic/job/DTOMessageGroup1Consumer.java
@@ -14,7 +14,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 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 DTOMessageGroup1Consumer implements WorkHandler<DTOMessage> {
         PoiStoreStaffDOMapper poiStoreStaffDOMapper = dtoMessage.getPoiStoreStaffDOMapper();
         QWMailListManageService qwMailListManageService = dtoMessage.getQwMailListManageService();
         Long storeId = dtoMessage.getStoreId();
+        List<Map<String,Object>> tagList = poiStoreStaffDOMapper.selectStaffTagByStoreId(storeId);
+        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,17 +71,20 @@ public class DTOMessageGroup1Consumer implements WorkHandler<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)) {
+                                if ("导购".equals(groupName)){
                                     String tagName = tags[j].getTagName();
-                                    String staffCode = poiStoreStaffDOMapper.selectStaffCodeByTagNew(storeId, tagName);
-                                    if (StringUtils.isNotBlank(staffCode)) {
-                                        turnBackDTO.setEaCode(staffCode);
-                                    } else {
+                                    Long staffId = tagMap.get(tagName);
+                                    if (staffId != null){
+                                        PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectById(staffId);
+                                        if (poiStoreStaff!=null){
+                                            turnBackDTO.setEaCode(poiStoreStaff.getStaffCode());
+                                        }
+                                    }else{
                                         //todo 绑定在标签导购上，后续删除
                                         turnBackDTO.setEaCode(tagName);
                                     }