Merge branch 'dev_wx_msg' into dev_temp

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

@@ -64,7 +64,10 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
      * @Author liushaowen
      * @Date 2020/10/22 13:23
      */
-    int clearResiSubscribeCount(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId,@Param("userId") String userId);
+    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,
@@ -77,5 +80,8 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
                             @Param("templateId")String templateId,
                             @Param("resiOpenId") String resiOpenId);
 
-    void unSubscribe(String userId, String customerId, String templateId, String resiOpenId);
+    void unSubscribe(@Param("userId") String userId,
+                     @Param("customerId") String customerId,
+                     @Param("templateId") String templateId,
+                     @Param("resiOpenId") String resiOpenId);
 }

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

@@ -78,5 +78,8 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
                             @Param("templateId") String templateId,
                             @Param("openId") String workOpenId);
 
-    void unSubscribe(String userId, String customerId, String templateId, String workOpenId);
+    void unSubscribe(@Param("userId") String userId,
+                     @Param("customerId")String customerId,
+                     @Param("templateId")String templateId,
+                     @Param("workOpenId")String workOpenId);
 }

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

@@ -46,6 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -441,6 +442,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         return msgSubscribeStatusDao.getUserSubscribeStatusDTO(loginUserId, customerId, clientType, templateId);
     }
 
+    @Transactional
     @Override
     public void saveWxSubscribe(String customerId, String clientType, String templateId, String wxAlwaysVisit,
                                 String wxSubscribeStatus, String behaviorType, String userId) {

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

@@ -55,7 +55,7 @@
         where USER_ID =     #{userId}
           and CUSTOMER_ID = #{customerId}
           and TEMPLATE_ID = #{templateId}
-          and WX_OPEN_ID = #{resiOpenId}
+          and WX_OPEN_ID = #{workOpenId}
           and del_flag =0
     </update>