发送订阅，获取templateId修改

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java

@@ -67,13 +67,12 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
     /**
      * @Description 获取模板id
      * @param openId
-     * @param templateId
      * @param customerId
      * @return java.lang.Integer
      * @Author liushaowen
      * @Date 2020/10/23 10:53
      */
-    String getResiSubscribeTemplateId(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId);
+    String getResiSubscribeTemplateId(@Param("openId") String openId, @Param("customerId") String customerId);
 
     WxmpResiUserSubscribeEntity getWxResiSubscribe(@Param("userId") String userId, @Param("customerId") String customerId,
                                                    @Param("templateId") String templateId);

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java

@@ -68,13 +68,12 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
     /**
      * @Description 获取模板id
      * @param openId
-     * @param templateId
      * @param customerId
      * @return java.lang.String
      * @Author liushaowen
      * @Date 2020/10/23 10:54
      */
-    String getWorkSubscribeTemplateId(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId);
+    String getWorkSubscribeTemplateId(@Param("openId") String openId, @Param("customerId") String customerId);
 
     WxmpWorkUserSubscribeEntity getWxWorkSubscribe(@Param("userId") String userId,
                                                    @Param("customerId") String customerId,

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -169,9 +169,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 
                 //获取模板id
                 if (WxmpMessageConstant.RESI.equals(clientType)) {
-                    templateId = wxmpResiUserSubscribeDao.getResiSubscribeTemplateId(openId, templateId, customerId);
+                    templateId = wxmpResiUserSubscribeDao.getResiSubscribeTemplateId(openId, customerId);
                 } else if (WxmpMessageConstant.WORK.equals(clientType)) {
-                    templateId = wxmpWorkUserSubscribeDao.getWorkSubscribeTemplateId(openId, templateId, customerId);
+                    templateId = wxmpWorkUserSubscribeDao.getWorkSubscribeTemplateId(openId, customerId);
                 }
                 if (StringUtils.isBlank(templateId)) {
                     throw new WxSubscribeException("获取模板id失败", "", openId);

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml

@@ -44,7 +44,6 @@
       where
         del_flag = 0
         and customer_id = #{customerId}
-        and template_id = #{templateId}
         and wx_open_id = #{openId}
         and wx_subscribe_status = 'subscribe'
       limit 1

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml

@@ -50,7 +50,6 @@
       where
         del_flag = 0
         and customer_id = #{customerId}
-        and template_id = #{templateId}
         and wx_open_id = #{openId}
         and wx_subscribe_status = 'subscribe'
       limit 1