Merge branch 'feature-daiban-12-14' into developer

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

@@ -14,10 +14,12 @@ import com.gic.haoban.manage.api.dto.notify.qdto.NoticeMessageQDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService;
 import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.pojo.bo.NoticeMessageBO;
 import com.gic.haoban.manage.service.pojo.bo.TemplateContentBO;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.notify.NoticeMessageService;
 import com.gic.haoban.manage.service.service.notify.NoticeMessageTemplateService;
@@ -72,6 +74,9 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
 
+    @Autowired
+    private StaffService staffService;
+
     @Override
     public void noticeMessageMq(String json) {
         logger.info("通知消息：{}", json);
@@ -87,17 +92,31 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             logger.info("没有模板，无法发送消息：{}", messageQDTO.getTemplateCode());
             return;
         }
-        StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationService.getByClerkId(messageQDTO.getClerkId());
-        if (clerkRelationDTO == null) {
+        //stff存在 发送到staff上
+        String wxUserId = null;
+        String wxEnterpriseId = null;
+        StaffClerkRelationDTO clerkRelationDTO = null;
+        if (StringUtils.isNotBlank(messageQDTO.getStaffId())) {
+            TabHaobanStaff haobanStaff = staffService.selectById(messageQDTO.getStaffId());
+            wxUserId = haobanStaff != null ? haobanStaff.getWxUserId() : null;
+            wxEnterpriseId = haobanStaff != null ? haobanStaff.getWxEnterpriseId() : null;
+        }
+        if (StringUtils.isNotEmpty(messageQDTO.getClerkId())) {
+            clerkRelationDTO = staffClerkRelationService.getByClerkId(messageQDTO.getClerkId());
+        }
+        if (wxUserId == null && clerkRelationDTO == null) {
             logger.info("没有导购：{}", messageQDTO.getClerkId());
             return;
         }
+        wxUserId = (wxUserId == null ? clerkRelationDTO.getWxUserId() : wxUserId);
+        wxEnterpriseId = (wxEnterpriseId == null ? clerkRelationDTO.getEnterpriseId() : wxEnterpriseId);
+
         //消息组装 新增消息
         NoticeMessageBO noticeMessageBO = new NoticeMessageBO();
         noticeMessageBO.setCategoryType(messageTypeEnum.getCategory());
         noticeMessageBO.setMessageType(messageQDTO.getMessageType());
-        noticeMessageBO.setClerkId(messageQDTO.getClerkId());
-        noticeMessageBO.setStoreId(clerkRelationDTO.getStoreId());
+        noticeMessageBO.setClerkId(messageQDTO.getClerkId() != null ? messageQDTO.getClerkId() : "-1");
+        noticeMessageBO.setStoreId(clerkRelationDTO != null ? clerkRelationDTO.getStoreId() : "-1");
         noticeMessageBO.setTitle(messageTypeEnum.getName());
         noticeMessageBO.setTemplateCode(messageTypeEnum.getTemplateCode());
         noticeMessageBO.setDescription(haobanNotice);
@@ -107,7 +126,7 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         noticeMessageService.addOrCreateNoticeMessage(noticeMessageBO);
 
         //发送企业微信
-        sendMessage(contentList, clerkRelationDTO.getWxEnterpriseId(), clerkRelationDTO.getWxUserId(), messageTypeEnum, noticeMessageBO.getMessageContent());
+        sendMessage(contentList, wxEnterpriseId, wxUserId, messageTypeEnum, noticeMessageBO.getMessageContent());
     }
 
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/config/LongHttpMessageConverter.java

@@ -14,7 +14,6 @@ public class LongHttpMessageConverter extends MappingJackson2HttpMessageConverte
 
     public LongHttpMessageConverter() {
         super();
-        MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
         //修复：前端js 精度问题
         ObjectMapper objectMapper = getObjectMapper();
         SimpleModule simpleModule = new SimpleModule();