From 16b2d07c8ca311e185c4a51e6f3a96fb0caf31a8 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Thu, 22 Oct 2020 15:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85=E6=B6=88?= =?UTF-8?q?=E6=81=AF=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/WxmpMessageConstant.java | 2 +- .../java/com/epmet/dao/WxmpResiUserSubscribeDao.java | 1 - .../epmet/service/impl/WxmpMessageServiceImpl.java | 12 ++++++------ .../resources/mapper/WxmpResiUserSubscribeDao.xml | 12 ++++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java index ba61eea035..a8f8f2ea7e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/WxmpMessageConstant.java @@ -18,7 +18,7 @@ public interface WxmpMessageConstant { int USER_REFUSED = 43101; - String AUTHORIZER_ACCESS_TOKEN = "authorizerRefreshToken"; + String AUTHORIZER_ACCESS_TOKEN = "authorizerAccessToken"; String RESI = "resi"; 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 d9ae74e313..d2ec0c8443 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 @@ -18,7 +18,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.WxmpResiUserSubscribeDTO; import com.epmet.entity.WxmpResiUserSubscribeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; 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 c32963ea07..328cdd9aeb 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 @@ -161,9 +161,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { //判断用户是否有次数 Integer count = null; if (WxmpMessageConstant.RESI.equals(clientType)) { - count = wxmpResiUserSubscribeDao.getResiSubscribeInfo(openId, customerId, templateId); + count = wxmpResiUserSubscribeDao.getResiSubscribeInfo(openId, templateId, customerId); } else if (WxmpMessageConstant.WORK.equals(clientType)) { - count = wxmpWorkUserSubscribeDao.getWorkSubscribeInfo(openId, customerId, templateId); + count = wxmpWorkUserSubscribeDao.getWorkSubscribeInfo(openId, templateId, customerId); } if (count == null) { //用户未订阅 @@ -203,9 +203,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { //订阅条数-1 int decrease = 0; if (WxmpMessageConstant.RESI.equals(clientType)) { - decrease = wxmpResiUserSubscribeDao.decreaseResiSubscribeCount(openId, customerId, templateId, 1); + decrease = wxmpResiUserSubscribeDao.decreaseResiSubscribeCount(openId, templateId, customerId, 1); } else if (WxmpMessageConstant.WORK.equals(clientType)) { - decrease = wxmpWorkUserSubscribeDao.decreaseWorkSubscribeCount(openId, customerId, templateId, 1); + decrease = wxmpWorkUserSubscribeDao.decreaseWorkSubscribeCount(openId, templateId, customerId, 1); } if (decrease == 0) { logger.error("消息{}发送成功但订阅条数-1失败", JSON.toJSONString(msg)); @@ -221,9 +221,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { if (errcode.equals(WxmpMessageConstant.USER_REFUSED)) { int clear = 0; if (WxmpMessageConstant.RESI.equals(clientType)) { - clear = wxmpResiUserSubscribeDao.clearResiSubscribeCount(openId, customerId, templateId); + clear = wxmpResiUserSubscribeDao.clearResiSubscribeCount(openId, templateId, customerId); } else if (WxmpMessageConstant.WORK.equals(clientType)) { - clear = wxmpWorkUserSubscribeDao.clearWorkSubscribeCount(openId, customerId, templateId); + clear = wxmpWorkUserSubscribeDao.clearWorkSubscribeCount(openId, templateId, customerId); } if (clear == 0) { logger.error("消息{}发送失败且清空订阅条数失败", JSON.toJSONString(msg)); 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 4a07a9475b..2b97a22eec 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 @@ -3,12 +3,12 @@ - select - `count` + count from Wxmp_Resi_User_Subscribe where - del_flag =0 + del_flag = 0 and customer_id = #{customerId} and template_id = #{templateId} and wx_open_id = #{openId} @@ -17,9 +17,9 @@ update Wxmp_Resi_User_Subscribe - set count = if(count < 1, 0, count - ${num} ) + set count = if(count 1, 0, count - ${num} ) where - del_flag =0 + del_flag = 0 and customer_id = #{customerId} and template_id = #{templateId} and wx_open_id = #{openId} @@ -31,7 +31,7 @@ set count = 0, wx_subscribe_status = 'unsubscribe' where - del_flag =0 + del_flag = 0 and customer_id = #{customerId} and template_id = #{templateId} and wx_open_id = #{openId}