From a23b4eec51a3d526f1e0f64c0faa74923483d809 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 30 Oct 2020 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AE=A2=E9=98=85:=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E9=98=85+=E6=80=BB=E6=98=AF=3D=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=AC=A1=E6=95=B0=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E9=98=85=EF=BC=8C=E4=B8=8D=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dao/WxmpWorkUserSubscribeDao.java   |  2 +-
 .../service/impl/WxmpMessageServiceImpl.java  | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

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 0f5551cff3..2ba5c14e08 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
@@ -53,7 +53,7 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
      * @Author liushaowen
      * @Date 2020/10/22 9:38
      */
-    int decreaseWorkSubscribeCount(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId, @Param("num") int i,@Param("userId") String userId);
+    int decreaseWorkSubscribeCount(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId, @Param("num") int decr,@Param("userId") String userId);
 
     /**
      * @Description 清空订阅数，修改订阅状态
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 3004f461a3..6678102499 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
@@ -450,11 +450,11 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         if (AppClientConstant.APP_GOV.equals(clientType)) {
             // 工作端
             openId = getWorkOpenId(userId);
-            saveWxWorkSubscribe(customerId, templateId, wxSubscribeStatus, userId, openId);
+            saveWxWorkSubscribe(customerId, templateId, wxSubscribeStatus, userId, openId, wxAlwaysVisit);
         } else {
             //居民端
             openId = getResiOpenId(userId);
-            saveWxResiSubscribe(customerId, templateId, wxSubscribeStatus, userId, openId);
+            saveWxResiSubscribe(customerId, templateId, wxSubscribeStatus, userId, openId, wxAlwaysVisit);
         }
 
         // 2.保存行为记录
@@ -494,7 +494,8 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      * @author wxz
      * @date 2020.10.22 09:56
      */
-    private void saveWxResiSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId, String openId) {
+    private void saveWxResiSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
+                                     String openId, String wxAlwaysVisit) {
 
         WxmpResiUserSubscribeEntity wxResiSubscribe = wxmpResiUserSubscribeDao.getWxResiSubscribe(userId, customerId, templateId);
         if (wxResiSubscribe == null) {
@@ -511,8 +512,12 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 
         if (WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus)) {
             wxmpResiUserSubscribeDao.incrSubscribeCount(1, userId, customerId, templateId, openId);
-        } else {
+        } else if (WxMsgTemplateSubscribeStatus.UNSUBSCRIBE.equals(wxSubscribeStatus) && "yes".equals(wxAlwaysVisit)) {
+            // 总是+取消
             wxmpResiUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
+        } else {
+            // 取消
+            wxmpResiUserSubscribeDao.decreaseResiSubscribeCount(openId, templateId, customerId, 1, userId);
         }
     }
 
@@ -522,7 +527,8 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      * @author wxz
      * @date 2020.10.22 14:21
      */
-    private void saveWxWorkSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId, String openId) {
+    private void saveWxWorkSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
+                                     String openId, String wxAlwaysVisit) {
         WxmpWorkUserSubscribeEntity wxWorkSubscribe = wxmpWorkUserSubscribeDao.getWxWorkSubscribe(userId, customerId, templateId);
         if (wxWorkSubscribe == null) {
             WxmpWorkUserSubscribeEntity insert = new WxmpWorkUserSubscribeEntity();
@@ -538,8 +544,12 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 
         if (WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus)) {
             wxmpWorkUserSubscribeDao.incrSubscribeCount(1, userId, customerId, templateId, openId);
-        } else {
+        } else if (WxMsgTemplateSubscribeStatus.UNSUBSCRIBE.equals(wxSubscribeStatus) && "yes".equals(wxAlwaysVisit)) {
+            // 取消订阅+总是
             wxmpWorkUserSubscribeDao.unSubscribe(userId, customerId, templateId, openId);
+        } else {
+            // 取消订阅+不总是
+            wxmpWorkUserSubscribeDao.decreaseWorkSubscribeCount(openId, templateId, customerId, 1, userId);
         }
 
     }