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 { PoiStoreStaffDOMapper poiStoreStaffDOMapper = dtoMessage.getPoiStoreStaffDOMapper(); QWMailListManageService qwMailListManageService = dtoMessage.getQwMailListManageService(); PrivilageCpUserStoreDO cpUserStoreDO = dtoMessage.getPrivilageCpUserStoreDO(); + List> tagList = poiStoreStaffDOMapper.selectStaffTagByStoreId(cpUserStoreDO.getStoreId()); + Map tagMap = new HashMap<>(); + for (Map map:tagList){ + tagMap.put((String)map.get("tag"),(Long)map.get("staffId")); + } + List customers = null; try { customers = qwMailListManageService.getCustomer(cpUserId); @@ -63,14 +71,14 @@ public class DTOMessageHandler implements EventHandler { 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 { 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> 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 customers = null; wxCpService = WxCpConfiguration.getCpService(applicationid); WxCpExternalContactService externalContactService = wxCpService.getExternalContactService(); - List customerStrs = privilageCpUserDOMapper.selectCustomerIdsByCpUserId(cpUserId); + List 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 + +