From ba28386d11ac20995c17c4c9531a73c330b2067c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 2 Nov 2020 15:01:50 +0800
Subject: [PATCH] =?UTF-8?q?wxmp=5Ftemplate=5Fmsg=5Fsubnscribe=5Fstatus?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=85=B3=E5=AF=B9=E8=B1=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?open=5Fid=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WxmpTemplateMsgSubscribeStatusDao.java    |  6 ++--
 .../WxmpTemplateMsgSubscribeStatusEntity.java |  5 ++++
 .../service/impl/WxmpMessageServiceImpl.java  | 28 ++++++++++++++++---
 .../WxmpTemplateMsgSubscribeStatusDao.xml     |  8 ++++--
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpTemplateMsgSubscribeStatusDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpTemplateMsgSubscribeStatusDao.java
index 50d98f5aa8..75b577fce7 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpTemplateMsgSubscribeStatusDao.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpTemplateMsgSubscribeStatusDao.java
@@ -35,10 +35,12 @@ public interface WxmpTemplateMsgSubscribeStatusDao extends BaseDao<WxmpTemplateM
     WxMsgAuthInfoResultDTO getUserSubscribeStatusDTO(@Param("userId") String userId,
                                                      @Param("customerId") String customerId,
                                                      @Param("clientType") String clientType,
-                                                     @Param("templateId") String templateId);
+                                                     @Param("templateId") String templateId,
+                                                     @Param("openId") String openId);
 
     WxmpTemplateMsgSubscribeStatusEntity getUserSubscribeStatusEntity(@Param("userId") String userId,
                                                                       @Param("customerId") String customerId,
                                                                       @Param("clientType") String clientType,
-                                                                      @Param("templateId") String templateId);
+                                                                      @Param("templateId") String templateId,
+                                                                      @Param("openId") String openId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
index f3d158a0c5..3e5d685841 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/WxmpTemplateMsgSubscribeStatusEntity.java
@@ -76,4 +76,9 @@ public class WxmpTemplateMsgSubscribeStatusEntity extends BaseEpmetEntity {
 	/**模板id*/
 	private String templateId;
 
+	/**
+	 * 微信openId
+	 */
+	private String wxOpenId;
+
 }
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 7d9fa880db..be69f06d1a 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -32,7 +32,6 @@ import com.epmet.dao.WxmpResiUserSubscribeDao;
 import com.epmet.dao.WxmpTemplateMsgSubscribeStatusDao;
 import com.epmet.dao.WxmpUserSubscribeRecordDao;
 import com.epmet.dao.WxmpWorkUserSubscribeDao;
-import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
@@ -94,7 +93,17 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      */
     @Override
     public void saveSysAuthorizeInfo(String customerId, String clientType, String alwaysVisit, String subscribeStatus, String userId, String templateId) {
-        WxmpTemplateMsgSubscribeStatusEntity userSubscribeStatusEntity = msgSubscribeStatusDao.getUserSubscribeStatusEntity(userId, customerId, clientType, templateId);
+        String openId = null;
+        switch (clientType) {
+            case AppClientConstant.APP_GOV:
+                openId = getWorkOpenId(userId);
+                break;
+            case AppClientConstant.APP_RESI:
+                openId = getResiOpenId(userId);
+                break;
+        }
+
+        WxmpTemplateMsgSubscribeStatusEntity userSubscribeStatusEntity = msgSubscribeStatusDao.getUserSubscribeStatusEntity(userId, customerId, clientType, templateId, openId);
         if (userSubscribeStatusEntity != null) {
             userSubscribeStatusEntity.setAlwaysVisit(alwaysVisit);
             userSubscribeStatusEntity.setSubscribeStatus(subscribeStatus);
@@ -107,6 +116,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         userSubscribeStatusEntity.setClientType(clientType);
         userSubscribeStatusEntity.setTemplateId(templateId);
         userSubscribeStatusEntity.setAlwaysVisit(alwaysVisit);
+        userSubscribeStatusEntity.setWxOpenId(openId);
         userSubscribeStatusEntity.setSubscribeStatus(subscribeStatus);
         userSubscribeStatusEntity.setUserId(userId);
         msgSubscribeStatusDao.insert(userSubscribeStatusEntity);
@@ -439,7 +449,16 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 
     @Override
     public WxMsgAuthInfoResultDTO getAuthorizationInfo(String customerId, String clientType, String loginUserId, String templateId) {
-        return msgSubscribeStatusDao.getUserSubscribeStatusDTO(loginUserId, customerId, clientType, templateId);
+        String openId = null;
+        switch (clientType) {
+            case AppClientConstant.APP_RESI:
+                openId = getResiOpenId(loginUserId);
+                break;
+            case AppClientConstant.APP_GOV:
+                openId = getWorkOpenId(loginUserId);
+                break;
+        }
+        return msgSubscribeStatusDao.getUserSubscribeStatusDTO(loginUserId, customerId, clientType, templateId, openId);
     }
 
     @Transactional
@@ -471,7 +490,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         subscribeRecordDao.insert(record);
 
         // 3.更新用户模板订阅状态
-        WxmpTemplateMsgSubscribeStatusEntity subscribeStatusEntity = msgSubscribeStatusDao.getUserSubscribeStatusEntity(userId, customerId, clientType, templateId);
+        WxmpTemplateMsgSubscribeStatusEntity subscribeStatusEntity = msgSubscribeStatusDao.getUserSubscribeStatusEntity(userId, customerId, clientType, templateId, openId);
         if (subscribeStatusEntity == null) {
             subscribeStatusEntity = new WxmpTemplateMsgSubscribeStatusEntity();
             subscribeStatusEntity.setUserId(userId);
@@ -480,6 +499,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
             subscribeStatusEntity.setWxAlwaysVisit(wxAlwaysVisit);
             subscribeStatusEntity.setCustomerId(customerId);
             subscribeStatusEntity.setClientType(clientType);
+            subscribeStatusEntity.setWxOpenId(openId);
             msgSubscribeStatusDao.insert(subscribeStatusEntity);
             return;
         }
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpTemplateMsgSubscribeStatusDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpTemplateMsgSubscribeStatusDao.xml
index fd51895084..ca12f834cc 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpTemplateMsgSubscribeStatusDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpTemplateMsgSubscribeStatusDao.xml
@@ -17,12 +17,14 @@
                created_by,
                created_time,
                updated_by,
-               updated_time
+               updated_time,
+               WX_OPEN_ID
         from wxmp_template_msg_subscribe_status status
         where USER_ID = #{userId}
           and CUSTOMER_ID = #{customerId}
           and CLIENT_TYPE = #{clientType}
           and TEMPLATE_ID = #{templateId}
+          and WX_OPEN_ID = #{openId}
     </select>
 
     <select id="getUserSubscribeStatusEntity" resultType="com.epmet.entity.WxmpTemplateMsgSubscribeStatusEntity">
@@ -39,11 +41,13 @@
                created_by,
                created_time,
                updated_by,
-               updated_time
+               updated_time,
+               WX_OPEN_ID
         from wxmp_template_msg_subscribe_status status
         where USER_ID = #{userId}
           and CUSTOMER_ID = #{customerId}
           and CLIENT_TYPE = #{clientType}
           and TEMPLATE_ID = #{templateId}
+          and OPEN_ID = #{openId}
     </select>
 </mapper>
\ No newline at end of file