消息分页

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/NoticeMessageApiService.java

@@ -31,6 +31,16 @@ public interface NoticeMessageApiService {
     public ServiceResponse<Page<NoticeMessageInfoDTO>> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo);
 
     /**
+     * 未读数量
+     *
+     * @param enterpriseId
+     * @param storeId
+     * @param clerkId      可以空 标识查询门店级别消息
+     * @return
+     */
+    public ServiceResponse<Integer> countUnReadNoticeMessage(String enterpriseId, String storeId, String clerkId);
+
+    /**
      * 更新已读状态
      *
      * @param id

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/NoticeMessageMapper.java

@@ -47,6 +47,20 @@ public interface NoticeMessageMapper {
                                              @Param("clerkId") String clerkId,
                                              @Param("categoryType") int categoryType);
 
+    /**
+     * 查询列表 根据导购
+     *
+     * @param enterpriseId
+     * @param storeId
+     * @param clerkId
+     * @param categoryType
+     * @return
+     */
+    int countUnreadNoticeMessage(@Param("enterpriseId") String enterpriseId,
+                                 @Param("storeId") String storeId,
+                                 @Param("clerkId") String clerkId,
+                                 @Param("categoryType") int categoryType);
+
 
     /**
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/NoticeMessageService.java

@@ -33,6 +33,16 @@ public interface NoticeMessageService {
     public Page<NoticeMessageBO> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo);
 
     /**
+     * 分页查询消息
+     *
+     * @param enterpriseId
+     * @param storeId      门店id
+     * @param clerkId
+     * @return
+     */
+    int countUnreadNoticeMessage(String enterpriseId, String storeId, String clerkId);
+
+    /**
      * 更新导购的已读转态
      *
      * @param enterpriseId

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/NoticeMessageServiceImpl.java

@@ -51,6 +51,11 @@ public class NoticeMessageServiceImpl implements NoticeMessageService {
     }
 
     @Override
+    public int countUnreadNoticeMessage(String enterpriseId, String storeId, String clerkId) {
+        return noticeMessageMapper.countUnreadNoticeMessage(enterpriseId, storeId, clerkId, -1);
+    }
+
+    @Override
     public boolean updateNoticeMessageReadFlag(String enterpriseId, String clerkId, int categoryType) {
         noticeMessageMapper.updateNoticeMessageReadFlag(enterpriseId, clerkId, categoryType);
         return true;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -119,6 +119,12 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
     }
 
     @Override
+    public ServiceResponse<Integer> countUnReadNoticeMessage(String enterpriseId, String storeId, String clerkId) {
+        int count = noticeMessageService.countUnreadNoticeMessage(enterpriseId, storeId, clerkId);
+        return ServiceResponse.success(count);
+    }
+
+    @Override
     public ServiceResponse<Boolean> updateReadFlagById(Long id) {
         NoticeMessageBO noticeMessageBO = new NoticeMessageBO();
         noticeMessageBO.setNoticeMessageId(id);

haoban-manage3-service/src/main/resources/mapper/NoticeMessageMapper.xml

@@ -226,6 +226,22 @@
     order by create_time desc
   </select>
 
+  <select id="countUnreadNoticeMessage" resultType="Integer">
+    select
+    count(*)
+    from tab_haoban_notice_message
+    where enterprise_id = #{enterpriseId}
+    and read_flag=0
+    and store_id = #{storeId}
+    <if test="clerkId != null">
+      and clerk_id =#{clerkId}
+    </if>
+    <if test="categoryType != -1">
+      and category_type =#{categoryType}
+    </if>
+    order by create_time desc
+  </select>
+
   <update id="updateNoticeMessageReadFlag">
     update tab_haoban_notice_message
     set read_flag=1,update_time = now()

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java

@@ -119,8 +119,8 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/list")
-    public HaobanResponse list(@RequestBody @Valid MessageListQO qo, PageQo pageQo) {
-        ServiceResponse<Page<NoticeMessageInfoDTO>> retPage = noticeMessageService.pageNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), qo.getCategoryType(), pageQo.getBasePageInfo());
+    public HaobanResponse list(@RequestBody @Valid MessageListQO qo) {
+        ServiceResponse<Page<NoticeMessageInfoDTO>> retPage = noticeMessageService.pageNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), qo.getCategoryType(), qo.getBasePageInfo());
         return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(retPage.getResult()));
     }
 
@@ -165,4 +165,16 @@ public class NotifyController extends WebBaseController {
     }
 
 
+    /**
+     * 消息类别
+     *
+     * @return
+     */
+    @RequestMapping("/message/count")
+    public HaobanResponse messageCount(@RequestBody @Valid MessageListQO qo) {
+        ServiceResponse<Integer> ret = noticeMessageService.countUnReadNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
+        return resultResponse(HaoBanErrCode.ERR_1, ret.getResult());
+    }
+
+
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/CommonQO.java

 package com.gic.haoban.manage.web.qo;
 
+import com.gic.commons.web.qo.PageQo;
+
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -8,7 +10,7 @@ import java.io.Serializable;
  *
  * @author hua
  */
-public class CommonQO implements Serializable {
+public class CommonQO extends PageQo implements Serializable {
     @NotNull(message = "企业id不为空")
     private String wxEnterpriseId;
     @NotNull(message = "成员id不为空")

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/notify/MessageListQO.java

@@ -10,6 +10,7 @@ import com.gic.haoban.manage.web.qo.CommonQO;
 public class MessageListQO extends CommonQO {
     private Integer categoryType = -1;
 
+
     public Integer getCategoryType() {
         return categoryType;
     }