Merge branch 'bugfix-0215' into 'master'

企业微信openId兼容

See merge request !168

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java

@@ -25,12 +25,15 @@ public interface MessageApiService {
 
     /**
      * 队列消费企业微信推送数据
+     *
      * @param param
      */
     @Deprecated
     void dealWxMessage(String param);
+
     /**
      * 发送消费消息
+     *
      * @param clerkId
      * @param memberId
      * @param memberName
@@ -62,4 +65,14 @@ public interface MessageApiService {
      */
     void sendWxMessage(String param);
 
+    /**
+     * 获取新的微信用户id
+     *
+     * @param wxEnterpriseId 微信企业id
+     * @param wxUserId       微信用户id
+     * @author xuwenqian
+     * @date 2021-07-16 10:09:00
+     */
+    String getNewWxUserId(String wxEnterpriseId, String wxUserId);
+
 }

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

@@ -558,4 +558,21 @@ public class MessageApiServiceImpl implements MessageApiService {
         messageDTO.setItems(items);
         qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(), config.getWxSuiteid(), messageDTO);
     }
+
+    @Override
+    public String getNewWxUserId(String wxEnterpriseId, String wxUserId) {
+        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        String corpid = wxEnterpriseDTO.getCorpid();
+
+        TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+
+        if (corpid.length() > 20) {
+            wxUserId = tabHaobanStaff.getWxOpenUseId();
+        } else {
+            wxUserId = tabHaobanStaff.getWxUserId();
+        }
+        return wxUserId;
+    }
+
+
 }