小程序appid

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialReportBuilder.java

@@ -14,6 +14,7 @@ import com.gic.haoban.manage.service.pojo.bo.content.context.MaterialReportConte
 import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.util.DrawImageUtils;
+import com.gic.haoban.manage.service.util.QwUtils;
 import com.gic.wechat.api.dto.qywx.QywxNewsArticleMessageDTO;
 import com.gic.wechat.api.dto.qywx.QywxNewsSendMessageDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -185,7 +186,7 @@ public class MaterialReportBuilder {
         newsSendMessage.setAgentId(Integer.parseInt(wxEnterpriseQwDTO.getAgentId()));
         newsSendMessage.setUserIds(Collections.singletonList(wxUserId));
         QywxNewsArticleMessageDTO articleInfo = new QywxNewsArticleMessageDTO();
-        articleInfo.setAppid(config.getAppid());
+        articleInfo.setAppid(QwUtils.getHbAppid(wxEnterpriseQwDTO, config.getAppid()));
         articleInfo.setTitle(context.getMessageTitle());
         articleInfo.setDescription(context.getMessageDesc());
         articleInfo.setPagepath(NoticeMessageUtil.buildMiniAppUrl(NoticeMessageTypeEnum.MATERIAL_REPORT_NOTIFY, context.extendParams(context.getMainStoreId())));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/PotentialCustomerNotifyBuilder.java

@@ -210,7 +210,7 @@ public class PotentialCustomerNotifyBuilder {
         itemDTO.setValue(String.format("新增%s个客户的销售线索，请及时跟进", count));
         ArrayList<String> list = new ArrayList<>();
         list.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
+        messageDTO.setAppid(QwUtils.getHbAppid(wxEnterpriseQwDTO, config.getAppid()));
         messageDTO.setUserIds(list);
         messageDTO.setPage(NoticeMessageUtil.buildMiniAppUrl(NoticeMessageTypeEnum.POTENTIAL_CUSTOMER_NOTIFY, extendParams));
         messageDTO.setTitle("销售线索通知");

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

@@ -263,7 +263,7 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             appUrl += messageTypeEnum.getPageType();
         }
         appUrl += "&data=" + data;
-        messageDTO.setAppid(config.getAppid());
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setAgentId(Integer.parseInt(qwDTO.getAgentId()));
         messageDTO.setAgentName(qwDTO.getAgentName());
         messageDTO.setUserIds(wxUserIdList);
@@ -416,7 +416,7 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
 
         List<String> userList = new ArrayList<>();
         userList.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setUserIds(userList);
         messageDTO.setPage(appUrl);
         messageDTO.setTitle(StringUtils.isNotBlank(title)?title:messageTypeEnum.getName());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -596,7 +596,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         if (qwDTO.needOpenUserId3th()) {
             wxUserId = staff.getWxOpenUseId();
         }
-        messageDTO.setAppid(config.getAppid());
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setUserIds(Arrays.asList(wxUserId));
         messageDTO.setPage(
                 NoticeMessageTypeEnum.OFFLINE_PRE.getPageUrl() + NoticeMessageTypeEnum.OFFLINE_PRE.getPageType());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java

@@ -250,15 +250,15 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         items.add(dto2);
         ArrayList<String> list = new ArrayList<>();
         list.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setUserIds(list);
         messageDTO.setPage(pageUrl);
         messageDTO.setTitle(title);
         messageDTO.setItems(items);
 
         logger.info("发送参数为corpId============:{},suitId============:{},messageDTO============:{},", corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
-        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
         boolean b = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("发送===============》{}", b);
         return b;
@@ -306,14 +306,14 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             contentList.add(itemDTO);
         });
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-        messageDTO.setAppid(this.config.getAppid());
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setUserIds(Collections.singletonList(wxUserId));
         messageDTO.setTitle(title);
         messageDTO.setItems(contentList);
         messageDTO.setPage(pageUrl);
         logger.info("消息发送, corpId : {}, suitId : {}, messageDTO : {}", corpId, config.getWxSuiteid(), JSONObject.toJSONString(messageDTO));
-        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
-        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
         boolean sendResult = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("消息发送结果, sendResult : {}", sendResult);
         return sendResult;
@@ -359,15 +359,15 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         }
         ArrayList<String> list = new ArrayList<>();
         list.add(wxUserId);
-        messageDTO.setAppid(config.getAppid());
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
+        messageDTO.setAppid(QwUtils.getHbAppid(qwDTO, config.getAppid()));
         messageDTO.setUserIds(list);
         messageDTO.setPage(pageUrl);
         messageDTO.setTitle(title);
         messageDTO.setItems(items);
 
         logger.info("发送消息参数为corpId={},messageDTO={},", corpId, JSONObject.toJSONString(messageDTO));
-        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
-        WxEnterpriseQwDTO qwDTO =this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
         boolean b = qywxSuiteApiService.sendMessage(corpId, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), messageDTO,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("发送消息返回={}", b);
         return b;