From c02947ad5246d4ffd50b776f9c0b2f0c48cdb7d3 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 30 Oct 2020 16:30:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E7=8A=B6=E6=80=81=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

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 e327548ba4..7d9fa880db 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
@@ -46,6 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -441,6 +442,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         return msgSubscribeStatusDao.getUserSubscribeStatusDTO(loginUserId, customerId, clientType, templateId);
     }
 
+    @Transactional
     @Override
     public void saveWxSubscribe(String customerId, String clientType, String templateId, String wxAlwaysVisit,
                                 String wxSubscribeStatus, String behaviorType, String userId) {

From da3774067a6073617414e872cb6f221a2d454bff Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 30 Oct 2020 16:41:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0=E5=86=99=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/WxmpResiUserSubscribeDao.java   | 10 ++++++++--
 .../java/com/epmet/dao/WxmpWorkUserSubscribeDao.java   |  5 ++++-
 .../main/resources/mapper/WxmpWorkUserSubscribeDao.xml |  2 +-
 3 files changed, 13 insertions(+), 4 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 045d2cf32f..f103867708 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
@@ -64,7 +64,10 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
      * @Author liushaowen
      * @Date 2020/10/22 13:23
      */
-    int clearResiSubscribeCount(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId,@Param("userId") String userId);
+    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,
@@ -77,5 +80,8 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
                             @Param("templateId")String templateId,
                             @Param("resiOpenId") String resiOpenId);
 
-    void unSubscribe(String userId, String customerId, String templateId, String resiOpenId);
+    void unSubscribe(@Param("userId") String userId,
+                     @Param("customerId") String customerId,
+                     @Param("templateId") String templateId,
+                     @Param("resiOpenId") String resiOpenId);
 }
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 48163f9a5b..c5e2394835 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
@@ -78,5 +78,8 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
                             @Param("templateId") String templateId,
                             @Param("openId") String workOpenId);
 
-    void unSubscribe(String userId, String customerId, String templateId, String workOpenId);
+    void unSubscribe(@Param("userId") String userId,
+                     @Param("customerId")String customerId,
+                     @Param("templateId")String templateId,
+                     @Param("workOpenId")String workOpenId);
 }
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 ae54a96201..690e7759f4 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
@@ -55,7 +55,7 @@
         where USER_ID =     #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
-          and WX_OPEN_ID = #{resiOpenId}
+          and WX_OPEN_ID = #{workOpenId}
           and del_flag =0
     </update>