wx_user_id调整

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -93,22 +93,22 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             logger.info("没有模板，无法发送消息：{}", messageQDTO.getTemplateCode());
             return;
         }
-        String wxUserId = null;
+        String staffId = null;
         String wxEnterpriseId = null;
         StaffClerkRelationDTO clerkRelationDTO = null;
         if (StringUtils.isNotBlank(messageQDTO.getStaffId())) {
             TabHaobanStaff haobanStaff = staffService.selectById(messageQDTO.getStaffId());
-            wxUserId = haobanStaff != null ? haobanStaff.getWxUserId() : null;
+            staffId = haobanStaff != null ? haobanStaff.getStaffId() : null;
             wxEnterpriseId = haobanStaff != null ? haobanStaff.getWxEnterpriseId() : null;
         }
         if (StringUtils.isNotEmpty(messageQDTO.getClerkId())) {
             clerkRelationDTO = staffClerkRelationService.getByClerkIdForWxUserId(messageQDTO.getClerkId());
         }
-        if (wxUserId == null && clerkRelationDTO == null) {
+        if (staffId == null && clerkRelationDTO == null) {
             logger.info("没有导购：{}", messageQDTO.getClerkId());
             return;
         }
-        wxUserId = (wxUserId == null ? clerkRelationDTO.getQwUserId() : wxUserId);
+        staffId = (staffId == null ? clerkRelationDTO.getStaffId() : staffId);
         wxEnterpriseId = (wxEnterpriseId == null ? clerkRelationDTO.getWxEnterpriseId() : wxEnterpriseId);
 
         //消息组装 新增消息
@@ -124,9 +124,8 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         noticeMessageBO.setRelationId(messageQDTO.getOptTargetId());
         noticeMessageBO.setMessageContent(messageQDTO.getExtendContent() != null ? JSONObject.toJSONString(messageQDTO.getExtendContent()) : null);
         noticeMessageService.addOrCreateNoticeMessage(noticeMessageBO);
-
         //发送企业微信
-        sendMessage(contentList, wxEnterpriseId, wxUserId, messageTypeEnum, noticeMessageBO.getMessageContent());
+        sendMessage(contentList, wxEnterpriseId, staffId, messageTypeEnum, noticeMessageBO.getMessageContent());
     }
 
     @Override
@@ -231,19 +230,18 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
      * @param wxUserId
      * @param messageTypeEnum
      */
-    private void sendMessage(List<TemplateContentBO> contentList, String wxEnterpriseId, String wxUserId, NoticeMessageTypeEnum messageTypeEnum, String data) {
+    private void sendMessage(List<TemplateContentBO> contentList, String wxEnterpriseId, String staffId, NoticeMessageTypeEnum messageTypeEnum, String data) {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
         String corpid = qwDTO.getThirdCorpid() ;
-        TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId) ;
         if (tabHaobanStaff == null) {
-            logger.error("未查询到员工：wxUserId:{}", wxUserId);
+            logger.error("未查询到员工：staffId:{}", staffId);
             return;
         }
+        String wxUserId = tabHaobanStaff.getWxUserId();
         if (qwDTO.needOpenUserId3th()) {
             wxUserId = tabHaobanStaff.getWxOpenUseId();
-        } else {
-            wxUserId = tabHaobanStaff.getWxUserId();
         }
         List<ItemDTO> items = contentList.stream().map(bo -> {
             ItemDTO item = new ItemDTO();