From 167b6fd251682741c2a48f39f67c5a7580b2047e Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 30 Oct 2020 16:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=AC=A1=E6=95=B0=E4=B8=8D-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java | 6 ++++--
 .../src/main/resources/mapper/WxmpResiUserSubscribeDao.xml  | 4 +++-
 .../src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml  | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

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 37d1569982..e327548ba4 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
@@ -515,9 +515,10 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         } else if (WxMsgTemplateSubscribeStatus.UNSUBSCRIBE.equals(wxSubscribeStatus) && "yes".equals(wxAlwaysVisit)) {
             // 总是+取消
             wxmpResiUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
+            wxmpResiUserSubscribeDao.clearResiSubscribeCount(openId, templateId, customerId, userId);
         } else {
             // 取消
-            wxmpResiUserSubscribeDao.decreaseResiSubscribeCount(openId, templateId, customerId, 1, userId);
+            wxmpResiUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
         }
     }
 
@@ -547,9 +548,10 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         } else if (WxMsgTemplateSubscribeStatus.UNSUBSCRIBE.equals(wxSubscribeStatus) && "yes".equals(wxAlwaysVisit)) {
             // 取消订阅+总是
             wxmpWorkUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
+            wxmpWorkUserSubscribeDao.clearWorkSubscribeCount(openId, templateId, customerId, userId);
         } else {
             // 取消订阅+不总是
-            wxmpWorkUserSubscribeDao.decreaseWorkSubscribeCount(openId, templateId, customerId, 1, userId);
+            wxmpWorkUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
         }
 
     }
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 581fb07d23..f0d302e056 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
@@ -49,18 +49,19 @@
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID = #{resiOpenId}
+          and del_flag = 0
     </update>
 
     <!--取消订阅-->
     <update id="unSubscribe">
         update wxmp_resi_user_subscribe
         set WX_SUBSCRIBE_STATUS = 'unsubscribe',
-            COUNT               = 0,
             UPDATED_TIME = now()
         where USER_ID =     #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID = #{resiOpenId}
+          and del_flag = 0
     </update>
 
     <select id="getWxResiSubscribe" resultType="com.epmet.entity.WxmpResiUserSubscribeEntity">
@@ -82,6 +83,7 @@
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID  = #{openId}
+          and del_flag = 0
     </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 8c85868fbe..ae54a96201 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
@@ -11,6 +11,7 @@
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID = #{openId}
+          and del_flag =0
     </update>
 
     <select id="getWorkSubscribeInfo" parameterType="String" resultType="Integer">
@@ -49,13 +50,13 @@
 
     <update id="unSubscribe">
         update wxmp_work_user_subscribe
-        set WX_SUBSCRIBE_STATUS = 'unsubscribe',
-            COUNT               = 0,
+        set WX_SUBSCRIBE_STATUS = 'unsubscribe'
             UPDATED_TIME = now()
         where USER_ID =     #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID = #{resiOpenId}
+          and del_flag =0
     </update>
 
     <select id="getWxWorkSubscribe" resultType="com.epmet.entity.WxmpWorkUserSubscribeEntity">
@@ -77,5 +78,6 @@
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
           and WX_OPEN_ID = #{openId}
+          and del_flag =0
     </select>
 </mapper>