valhalla / fw-hestia

Commit e28086c709036c4ec832238fa15ecd724e0106a6

Authored by 张志伟
1 parent 1b7ce526

:zap: feat(*): 升级和对接新版会员 

- 升级和对接新版会员
Inline Side-by-side
Showing 2 changed files with 8 additions and 29 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java
  View file @e28086c
... ... @@ -43,8 +43,8 @@ public class MessageCenterController {
43 43  
44 44 @GetMapping("/unread")
45 45 @ControllerMethod("查询消息未读数")
46   - public Message<Integer> send(@CurrentUser PassportAuthBean user) {
47   - return success(messageCenterBizService.unreadCount(user.getUserId()));
  46 + public Message<Integer> send(@CurrentUser Long userId) {
  47 + return success(messageCenterBizService.unreadCount(userId));
48 48 }
49 49  
50 50 @GetMapping("/query/pageParams")
... ...
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
  View file @e28086c
... ... @@ -42,7 +42,6 @@ import java.util.function.Consumer;
42 42 import java.util.stream.Collectors;
43 43  
44 44 import static cn.fw.common.businessvalidator.Validator.BV;
45   -import static cn.fw.hestia.common.constant.MessageConstant.MAX_FREQUENCY;
46 45  
47 46 /**
48 47 * @author : kurisu
... ... @@ -170,6 +169,9 @@ public class MessageCenterBizService {
170 169 */
171 170 @Cacheable(cacheNames = "UnreadCount", key = "':unread-count:' + #memberId", condition = "#result != 0")
172 171 public int unreadCount(Long memberId) {
  172 + if (memberId <= 0) {
  173 + return 0;
  174 + }
173 175 return messageHistoryService.count(Wrappers.<MessageHistory>lambdaQuery()
174 176 .eq(MessageHistory::getMemberId, memberId)
175 177 .eq(MessageHistory::getReadz, Boolean.FALSE)
... ... @@ -204,6 +206,9 @@ public class MessageCenterBizService {
204 206 * @return
205 207 */
206 208 public AppPage<MessageHistoryVO> queryHistory(HistoryQuery query) {
  209 + if (Objects.isNull(query.getMemberId()) || query.getMemberId() <= 0) {
  210 + return AppPage.empty(query);
  211 + }
207 212 PageData<MessageHistory> pageData = messageHistoryService.page(new PageData<>(query), Wrappers.<MessageHistory>lambdaQuery()
208 213 .eq(MessageHistory::getMemberId, query.getMemberId())
209 214 .eq(MessageHistory::getYn, Boolean.TRUE)
... ... @@ -222,32 +227,6 @@ public class MessageCenterBizService {
222 227 return page;
223 228 }
224 229  
225   - /**
226   - * 当用户关注了公众号
227   - *
228   - * @param memberId
229   - */
230   - public void onAttention(Long memberId) {
231   - if (Objects.isNull(memberId)) {
232   - return;
233   - }
234   - List<MessageHistory> list = messageHistoryService.list(Wrappers.<MessageHistory>lambdaQuery()
235   - .eq(MessageHistory::getMemberId, memberId)
236   - .eq(MessageHistory::getYn, Boolean.TRUE)
237   - .eq(MessageHistory::getReadz, Boolean.FALSE)
238   - .eq(MessageHistory::getState, MessageStateEnum.MADA)
239   - );
240   - if (CollectionUtils.isEmpty(list)) {
241   - return;
242   - }
243   - for (MessageHistory history : list) {
244   - history.setSendTime(new Date());
245   - if (history.getFrequency() >= MAX_FREQUENCY) {
246   - history.setFrequency(MAX_FREQUENCY - 1);
247   - }
248   - }
249   - messageHistoryService.updateBatchById(list);
250   - }
251 230  
252 231 public void readMessage(MessageHistory history) {
253 232 if (Boolean.FALSE.equals(history.getReadz())) {
... ...