From bc4c501845cf676cc56ffb48e58d885b003a150f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 30 Oct 2020 15:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=94=A8=E5=93=AA=E4=B8=AA?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AE=A2=E9=98=85=EF=BC=8C=E5=B0=B1=E7=BB=99?=
 =?UTF-8?q?=E5=93=AA=E4=B8=AAopenid=E5=A2=9E=E5=8A=A0=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/WxmpResiUserSubscribeDao.java     | 6 ++++--
 .../java/com/epmet/dao/WxmpWorkUserSubscribeDao.java     | 4 +++-
 .../com/epmet/service/impl/WxmpMessageServiceImpl.java   | 4 ++--
 .../main/resources/mapper/WxmpResiUserSubscribeDao.xml   | 1 +
 .../main/resources/mapper/WxmpWorkUserSubscribeDao.xml   | 9 +++++----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
index 3465d0d90f..045d2cf32f 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
@@ -66,8 +66,10 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
      */
     int clearResiSubscribeCount(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId,@Param("userId") String userId);
 
-    WxmpResiUserSubscribeEntity getWxResiSubscribe(@Param("userId") String userId, @Param("customerId") String customerId,
-                                                   @Param("templateId") String templateId);
+    WxmpResiUserSubscribeEntity getWxResiSubscribe(@Param("userId") String userId,
+                                                   @Param("customerId") String customerId,
+                                                   @Param("templateId") String templateId,
+                                                   @Param("openId") String openId);
 
     void incrSubscribeCount(@Param("incr") int incr,
                             @Param("userId") String userId,
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
index 2ba5c14e08..48163f9a5b 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
@@ -68,7 +68,9 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
 
     WxmpWorkUserSubscribeEntity getWxWorkSubscribe(@Param("userId") String userId,
                                                    @Param("customerId") String customerId,
-                                                   @Param("templateId") String templateId);
+                                                   @Param("templateId") String templateId,
+                                                   @Param("openId") String openId
+    );
 
     void incrSubscribeCount(@Param("incr") int incr,
                             @Param("userId") String userId,
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 6678102499..37d1569982 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
@@ -497,7 +497,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
     private void saveWxResiSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
                                      String openId, String wxAlwaysVisit) {
 
-        WxmpResiUserSubscribeEntity wxResiSubscribe = wxmpResiUserSubscribeDao.getWxResiSubscribe(userId, customerId, templateId);
+        WxmpResiUserSubscribeEntity wxResiSubscribe = wxmpResiUserSubscribeDao.getWxResiSubscribe(userId, customerId, templateId, openId);
         if (wxResiSubscribe == null) {
             WxmpResiUserSubscribeEntity insert = new WxmpResiUserSubscribeEntity();
             insert.setCount(WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus) ? 1 : 0);
@@ -529,7 +529,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      */
     private void saveWxWorkSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
                                      String openId, String wxAlwaysVisit) {
-        WxmpWorkUserSubscribeEntity wxWorkSubscribe = wxmpWorkUserSubscribeDao.getWxWorkSubscribe(userId, customerId, templateId);
+        WxmpWorkUserSubscribeEntity wxWorkSubscribe = wxmpWorkUserSubscribeDao.getWxWorkSubscribe(userId, customerId, templateId, openId);
         if (wxWorkSubscribe == null) {
             WxmpWorkUserSubscribeEntity insert = new WxmpWorkUserSubscribeEntity();
             insert.setCount(WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus) ? 1 : 0);
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
index 4a4764176d..581fb07d23 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
@@ -81,6 +81,7 @@
         where USER_ID = #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
+          and WX_OPEN_ID  = #{openId}
     </select>
 
 </mapper>
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
index f797632581..8c85868fbe 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
@@ -72,9 +72,10 @@
            created_time,
            updated_by,
            updated_time
-    from wxmp_work_user_subscribe
-    where USER_ID =     #{userId}
-      and CUSTOMER_ID = #{customerId}
-      and TEMPLATE_ID = #{templateId}
+        from wxmp_work_user_subscribe
+        where USER_ID =     #{userId}
+          and CUSTOMER_ID = #{customerId}
+          and TEMPLATE_ID = #{templateId}
+          and WX_OPEN_ID = #{openId}
     </select>
 </mapper>