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

@@ -7,30 +7,33 @@ import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
  * Created by tgs on 2020/2/20.
  */
 public interface MessageApiService {
-	/**
-	 * 接收企业微信的推送消息
-	 *
-	 * @param gicMessageDTO
-	 */
-	@Deprecated
-	void gicMessageReceive(GicMessageDTO gicMessageDTO);
+    /**
+     * 接收企业微信的推送消息
+     *
+     * @param gicMessageDTO
+     */
+    @Deprecated
+    void gicMessageReceive(GicMessageDTO gicMessageDTO);
 
-	/**
-	 * 接收企业微信的推送消息
-	 *
-	 * @param qywxCallBackDTO
-	 */
-	@Deprecated
-	void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
+    /**
+     * 接收企业微信的推送消息
+     *
+     * @param qywxCallBackDTO
+     */
+    @Deprecated
+    void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
 
-	/**
-	 * 队列消费企业微信推送数据
-	 * @param param
+    /**
+     * 队列消费企业微信推送数据
+     *
+     * @param param
      */
     @Deprecated
     void dealWxMessage(String param);
+
     /**
      * 发送消费消息
+     *
      * @param clerkId
      * @param memberId
      * @param memberName
@@ -38,28 +41,38 @@ public interface MessageApiService {
      * @param storeId
      * @return
      */
-	Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
+    Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
 
-	/**
-	 * 发送完善标签信息
-	 *
-	 * @param clerkId
-	 * @param clerkId
-	 * @param memberName
-	 * @param customerTime
-	 * @param orderId
-	 * @param storeId
-	 */
-	Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
+    /**
+     * 发送完善标签信息
+     *
+     * @param clerkId
+     * @param clerkId
+     * @param memberName
+     * @param customerTime
+     * @param orderId
+     * @param storeId
+     */
+    Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
 
 
-	/**
-	 * 通用发送企业微信消息
-	 *
-	 * @param param 参数
-	 * @author xuwenqian
-	 * @date 2021-07-16 10:09:00
-	 */
-	void sendWxMessage(String param);
+    /**
+     * 通用发送企业微信消息
+     *
+     * @param param 参数
+     * @author xuwenqian
+     * @date 2021-07-16 10:09:00
+     */
+    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;
+    }
+
+
 }