消息推送

mallplus-portal/src/main/java/com/zscat/mallplus/apirest/SysMessageRest.java

@@ -1,6 +1,7 @@
 package com.zscat.mallplus.apirest;
 
-import com.zscat.mallplus.oms.entity.OmsCartItem;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.ums.entity.SysMessage;
 import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.service.ISysMessageService;
@@ -11,11 +12,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @Api(tags = "SysMessageRest", description = "系统消息")
@@ -31,14 +29,17 @@ public class SysMessageRest {
     @ApiOperation("获取某个会员的消息列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public Object list() {
+    public Object list(
+            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         UmsMember umsMember = memberService.getNewCurrentMember();
-        List<SysMessage> list = new ArrayList<>();
+        IPage<SysMessage> page = new Page<>(pageNum, pageSize);
         if (umsMember != null && umsMember.getId() != null) {
-            list = messageService.listByUserId(umsMember.getId());
-            return new CommonResult().success(list);
+            page = messageService.listPageByUserId(umsMember.getId(), page);
+        } else {
+            page = messageService.listPageOfSys(page);
         }
-        return new CommonResult().success(list);
+        return new CommonResult().success(page);
     }
 
     @ApiOperation("获取消息内容")

mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/ISysMessageService.java

@@ -1,5 +1,6 @@
 package com.zscat.mallplus.ums.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.ums.entity.SysMessage;
 
@@ -18,4 +19,8 @@ public interface ISysMessageService extends IService<SysMessage> {
     List<SysMessage> listByUserId(Long userId);
 
     int updateStatus(SysMessage sysMessage);
+
+    IPage<SysMessage> listPageByUserId(Long id, IPage<SysMessage> page);
+
+    IPage<SysMessage> listPageOfSys(IPage<SysMessage> page);
 }

mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/SysMessageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zscat.mallplus.ums.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.ums.entity.SysMessage;
 import com.zscat.mallplus.ums.mapper.SysMessageMapper;
@@ -34,4 +35,22 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         baseMapper.updateById(sysMessage);
         return 1;
     }
+
+    @Override
+    public IPage<SysMessage> listPageByUserId(Long userId, IPage<SysMessage> page) {
+        QueryWrapper<SysMessage> qw = new QueryWrapper<>();
+        qw.eq("store_id", 1);
+        qw.and(wrapper -> wrapper.eq("user_id", userId).or().eq("user_id", 1));
+        qw.orderByDesc("ctime");
+        return this.page(page, qw);
+    }
+
+    @Override
+    public IPage<SysMessage> listPageOfSys(IPage<SysMessage> page) {
+        QueryWrapper<SysMessage> qw = new QueryWrapper<>();
+        qw.eq("store_id", 1);
+        qw.eq("user_id", 1);
+        qw.orderByDesc("ctime");
+        return this.page(page, qw);
+    }
 }

mallplus-portal/src/main/java/com/zscat/mallplus/unipush/PushCidsService.java

@@ -94,9 +94,20 @@ public class PushCidsService extends ServiceImpl<PushCidsMapper, PushCids> {
     public void unbindPhone(String cid) {
         if (StrUtil.isBlank(cid))
             return;
-        UpdateWrapper<PushCids> uw = new UpdateWrapper<>();
-        uw.set("userPhone", "");
-        uw.eq("getuiCid", cid);
-        baseMapper.update(null, uw);
+
+        PushCids pushCids = fetchByCid(cid);
+        if (pushCids != null) {
+            pushCids.setUserPhone("");
+            baseMapper.updateById(pushCids);
+        }
+    }
+
+    public PushCids fetchByCid(String cid) {
+        QueryWrapper<PushCids> qw = new QueryWrapper<>();
+        qw.eq("getuiCid", cid);
+        List<PushCids> list = baseMapper.selectList(qw);
+        if (list == null || list.isEmpty())
+            return null;
+        return list.get(0);
     }
 }