修复：订阅的时候，用哪个微信订阅，就给哪个openid增加次数；

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

@@ -66,8 +66,10 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
      */
     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,
-                                                   @Param("templateId") String templateId);
+    WxmpResiUserSubscribeEntity getWxResiSubscribe(@Param("userId") String userId,
+                                                   @Param("customerId") String customerId,
+                                                   @Param("templateId") String templateId,
+                                                   @Param("openId") String openId);
 
     void incrSubscribeCount(@Param("incr") int incr,
                             @Param("userId") String userId,

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

@@ -68,7 +68,9 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
 
     WxmpWorkUserSubscribeEntity getWxWorkSubscribe(@Param("userId") String userId,
                                                    @Param("customerId") String customerId,
-                                                   @Param("templateId") String templateId);
+                                                   @Param("templateId") String templateId,
+                                                   @Param("openId") String openId
+    );
 
     void incrSubscribeCount(@Param("incr") int incr,
                             @Param("userId") String userId,

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

@@ -497,7 +497,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
     private void saveWxResiSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
                                      String openId, String wxAlwaysVisit) {
 
-        WxmpResiUserSubscribeEntity wxResiSubscribe = wxmpResiUserSubscribeDao.getWxResiSubscribe(userId, customerId, templateId);
+        WxmpResiUserSubscribeEntity wxResiSubscribe = wxmpResiUserSubscribeDao.getWxResiSubscribe(userId, customerId, templateId, openId);
         if (wxResiSubscribe == null) {
             WxmpResiUserSubscribeEntity insert = new WxmpResiUserSubscribeEntity();
             insert.setCount(WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus) ? 1 : 0);
@@ -529,7 +529,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      */
     private void saveWxWorkSubscribe(String customerId, String templateId, String wxSubscribeStatus, String userId,
                                      String openId, String wxAlwaysVisit) {
-        WxmpWorkUserSubscribeEntity wxWorkSubscribe = wxmpWorkUserSubscribeDao.getWxWorkSubscribe(userId, customerId, templateId);
+        WxmpWorkUserSubscribeEntity wxWorkSubscribe = wxmpWorkUserSubscribeDao.getWxWorkSubscribe(userId, customerId, templateId, openId);
         if (wxWorkSubscribe == null) {
             WxmpWorkUserSubscribeEntity insert = new WxmpWorkUserSubscribeEntity();
             insert.setCount(WxMsgTemplateSubscribeStatus.SUBSCRIBE.equals(wxSubscribeStatus) ? 1 : 0);

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

@@ -81,6 +81,7 @@
         where USER_ID = #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
+          and WX_OPEN_ID  = #{openId}
     </select>
 
 </mapper>

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

@@ -76,5 +76,6 @@
         where USER_ID =     #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
+          and WX_OPEN_ID = #{openId}
     </select>
 </mapper>