系统通知

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NewInformDTO.java

@@ -0,0 +1,32 @@
+package com.chelvc.cloud.vehicle.api.dto;
+
+import lombok.Data;
+
+@Data
+public class NewInformDTO {
+
+    /**
+     * 订单通知数
+     */
+    private Long order = 0L;
+
+    /**
+     * 点赞回复数
+     */
+    private Long evaluate = 0L;
+
+    /**
+     * 优惠券数量
+     */
+    private Long coupon = 0L;
+
+    /**
+     * 付款数量
+     */
+    private Long pay = 0L;
+
+    /**
+     * 商品评价数量
+     */
+    private Long comment = 0L;
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/AddDynamicEvaluateRecordParam.java

@@ -41,4 +41,7 @@ public class AddDynamicEvaluateRecordParam implements Serializable {
      */
     @NotNull(message = "内容标识不能为空")
     private Long contentId;
+
+    @NotNull(message = "动态/回复用户标识")
+    private Long targetUserId;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/OmsOrderOperateHistoryService.java → vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/InformService.java

@@ -1,27 +1,29 @@
 package com.chelvc.cloud.vehicle.api.service;
 
+import com.chelvc.cloud.vehicle.api.dto.NewInformDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsOrderOperateHistoryDTO;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 
-/**
- * 订单操作记录
- */
-public interface OmsOrderOperateHistoryService {
+public interface InformService {
 
     /**
-     * 根据用户查询订单通知信息
+     * 获取用户的订单列表
      *
-     * @param userId 用户id
      * @param paging 分页信息
-     * @return 订单操作历史记录
+     * @return 用户的订单列表
      */
     Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging);
 
     /**
      * 将新订单通知标识更改
      *
-     * @param userId 用户id
      */
     void changeUserOrderInformFlag(Long userId);
+
+    /**
+     * 查看是否有系统新消息
+     *
+     */
+    NewInformDTO getNewInform(Long userId);
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/UserCouponService.java

@@ -71,4 +71,11 @@ public interface UserCouponService {
      * @return 优惠券领取记录主键
      */
     Long claimCoupon(Long couponId);
+
+    /**
+     * 查询可使用优惠券数量
+     * @param userId
+     * @return
+     */
+    Long queryNewInformNum(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/OmsOrderPayHistoryMapper.java

@@ -0,0 +1,9 @@
+package com.chelvc.cloud.vehicle.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrderPayHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OmsOrderPayHistoryMapper extends BaseMapper<OmsOrderPayHistory> {
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/Comment.java

@@ -1,8 +1,5 @@
 package com.chelvc.cloud.vehicle.server.entity;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -15,6 +12,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 商品评价数据模型
  *
@@ -73,4 +73,9 @@ public class Comment implements Entity<Long> {
      * 创建时间
      */
     private Date createTime;
+
+    /**
+     * 标识：0-新消息；1-已查看
+     */
+    private Integer flag;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/DynamicEvaluateRecord.java

@@ -34,7 +34,11 @@ public class DynamicEvaluateRecord implements Entity<Long> {
      */
     private Long userId;
     /**
-     * 操作类型：1-点赞；2-踩
+     * 用户标识
+     */
+    private Long targetUserId;
+    /**
+     * 操作类型：1-点赞；2-踩；3-回复
      */
     private Integer operaterType;
     /**
@@ -45,7 +49,10 @@ public class DynamicEvaluateRecord implements Entity<Long> {
      * 内容标识
      */
     private Long contentId;
-
+    /**
+     * 标识：0-未读；1-已读
+     */
+    private Integer flag;
     /**
      * 创建时间
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/OmsOrderPayHistory.java

@@ -0,0 +1,46 @@
+package com.chelvc.cloud.vehicle.server.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.chelvc.framework.database.entity.ModifyEntity;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 订单操作付款记录对象 oms_order_operate_history
+ * 
+ * @author igl
+ * @date 2023-12-15
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(autoResultMap = true)
+public class OmsOrderPayHistory extends ModifyEntity<Long>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 订单id */
+    private Long orderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 订单消息标识：0-新消息；1-已查看
+     */
+    private Integer flag;
+
+    /** 备注 */
+    private String note;
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CommentService.java

@@ -1,12 +1,12 @@
 package com.chelvc.cloud.vehicle.server.service;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.chelvc.cloud.vehicle.api.dto.CommentDTO;
 import com.chelvc.cloud.vehicle.api.param.CommentQueryParam;
 import com.chelvc.cloud.vehicle.server.entity.Comment;
 
+import java.util.List;
+
 /**
  * 商家评论业务接口
  *
@@ -22,4 +22,11 @@ public interface CommentService extends IService<Comment> {
      * @return 评价列表
      */
     List<CommentDTO> listGoodsComments(Long goodsId, CommentQueryParam param);
+
+    /**
+     * 查询商品评价新消息数
+     * @param userId
+     * @return
+     */
+    Long queryNewInformNum(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java

@@ -18,4 +18,11 @@ public interface DynamicEvaluateRecordService {
     Boolean updateRecord(AddDynamicEvaluateRecordParam param, Long userId);
 
     DynamicEvaluateRecordDTO queryOperaterType(Long id, Long userId, Integer recordType);
+
+    /**
+     * 查看新消息数
+     * @param userId
+     * @return
+     */
+    Long queryNewInformNum(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/IOmsOrderOperateHistoryService.java

@@ -1,8 +1,11 @@
 package com.chelvc.cloud.vehicle.server.service;
 
-import java.util.List;
-
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderOperateHistoryDTO;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderOperateHistory;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+
+import java.util.List;
 
 /**
  * 订单操作历史记录Service接口
@@ -59,4 +62,27 @@ public interface IOmsOrderOperateHistoryService
      * @return 结果
      */
     public int deleteOmsOrderOperateHistoryById(Long id);
+
+    /**
+     * 根据用户查询订单通知信息
+     *
+     * @param userId 用户id
+     * @param paging 分页信息
+     * @return 订单操作历史记录
+     */
+    Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging);
+
+    /**
+     * 将新订单通知标识更改
+     *
+     * @param userId 用户id
+     */
+    void changeUserOrderInformFlag(Long userId);
+
+    /**
+     * 查询订单操作历史数量
+     * @param userId
+     * @return
+     */
+    Long queryNewInformNum(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderPayHistoryService.java

@@ -0,0 +1,10 @@
+package com.chelvc.cloud.vehicle.server.service;
+
+public interface OmsOrderPayHistoryService {
+
+    /**
+     * 查看信息数
+     * @param userId
+     */
+    Long queryNewInformNum(Long userId);
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.java

@@ -1,12 +1,7 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
 import com.chelvc.cloud.uc.api.service.UserService;
@@ -20,6 +15,9 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.util.CollectionUtils;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * 商家评论业务操作实现
  *
@@ -47,4 +45,12 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         }
         return comments;
     }
+
+    @Override
+    public Long queryNewInformNum(Long userId) {
+        LambdaQueryWrapper<Comment> lwq = Wrappers.lambdaQuery();
+        lwq.eq(Comment::getUserId, userId);
+        lwq.eq(Comment::getFlag, 0);
+        return baseMapper.selectCount(lwq);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java

@@ -94,6 +94,14 @@ public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordSe
     return null;
   }
 
+  @Override
+  public Long queryNewInformNum(Long userId) {
+    LambdaQueryWrapper<DynamicEvaluateRecord> lwq = Wrappers.lambdaQuery();
+    lwq.eq(DynamicEvaluateRecord::getTargetUserId, userId);
+    lwq.eq(DynamicEvaluateRecord::getFlag, 0);
+    return baseMapper.selectCount(lwq);
+  }
+
   /**
    * 判断该用户是否有点赞/踩记录，点击新增记录，取消删除记录
    * @param lqw
@@ -112,6 +120,7 @@ public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordSe
       contentEvaluateRecord.setContentType(param.getRecordType().getValue());
       contentEvaluateRecord.setOperaterType(param.getDynamicStatusType().getValue());
       contentEvaluateRecord.setUserId(userId);
+      contentEvaluateRecord.setFlag(0);
       contentEvaluateRecord.setCreateTime(new Date());
       baseMapper.insert(contentEvaluateRecord);
     } else {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/InformServiceImpl.java

@@ -0,0 +1,57 @@
+package com.chelvc.cloud.vehicle.server.service.impl;
+
+import com.chelvc.cloud.vehicle.api.dto.NewInformDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderOperateHistoryDTO;
+import com.chelvc.cloud.vehicle.api.service.InformService;
+import com.chelvc.cloud.vehicle.api.service.UserCouponService;
+import com.chelvc.cloud.vehicle.server.service.CommentService;
+import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
+import com.chelvc.cloud.vehicle.server.service.IOmsOrderOperateHistoryService;
+import com.chelvc.cloud.vehicle.server.service.OmsOrderPayHistoryService;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class InformServiceImpl implements InformService {
+
+    private final IOmsOrderOperateHistoryService omsOrderOperateHistoryService;
+
+    private final DynamicEvaluateRecordService dynamicEvaluateRecordService;
+
+    private final UserCouponService userCouponService;
+
+    private final OmsOrderPayHistoryService omsOrderPayHistoryService;
+
+    private final CommentService commentService;
+
+    @Override
+    public Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging) {
+        return omsOrderOperateHistoryService.selectOmsOrderOperateHistoryListByUserId(userId, paging);
+    }
+
+    @Override
+    public void changeUserOrderInformFlag(Long userId) {
+        omsOrderOperateHistoryService.changeUserOrderInformFlag(SessionContextHolder.getId());
+    }
+
+    @Override
+    public NewInformDTO getNewInform(Long userId) {
+        NewInformDTO newInformDTO = new NewInformDTO();
+        Long evaluate = dynamicEvaluateRecordService.queryNewInformNum(userId);
+        newInformDTO.setEvaluate(evaluate);
+        Long order = omsOrderOperateHistoryService.queryNewInformNum(userId);
+        newInformDTO.setOrder(order);
+        Long coupon = userCouponService.queryNewInformNum(userId);
+        newInformDTO.setCoupon(coupon);
+        Long pay = omsOrderPayHistoryService.queryNewInformNum(userId);
+        newInformDTO.setPay(pay);
+        Long comment = commentService.queryNewInformNum(userId);
+        newInformDTO.setComment(comment);
+        return newInformDTO;
+    }
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderOperateHistoryServiceImpl.java

@@ -1,9 +1,10 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.OmsOrderOperateHistoryDTO;
-import com.chelvc.cloud.vehicle.api.service.OmsOrderOperateHistoryService;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderOperateHistoryMapper;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderOperateHistory;
 import com.chelvc.cloud.vehicle.server.service.IOmsOrderOperateHistoryService;
@@ -24,7 +25,7 @@ import java.util.List;
  */
 @Service
 public class OmsOrderOperateHistoryServiceImpl extends ServiceImpl<OmsOrderOperateHistoryMapper, OmsOrderOperateHistory>
-        implements IOmsOrderOperateHistoryService, OmsOrderOperateHistoryService
+        implements IOmsOrderOperateHistoryService
 {
     /**
      * 查询订单操作历史记录
@@ -124,4 +125,12 @@ public class OmsOrderOperateHistoryServiceImpl extends ServiceImpl<OmsOrderOpera
     public void changeUserOrderInformFlag(Long userId) {
         this.baseMapper.changeUserOrderInformFlag(userId);
     }
+
+    @Override
+    public Long queryNewInformNum(Long userId) {
+        LambdaQueryWrapper<OmsOrderOperateHistory> lwq = Wrappers.lambdaQuery();
+        lwq.eq(OmsOrderOperateHistory::getUserId, userId);
+        lwq.eq(OmsOrderOperateHistory::getFlag, 0);
+        return baseMapper.selectCount(lwq);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderPayHistoryServiceImpl.java

@@ -0,0 +1,21 @@
+package com.chelvc.cloud.vehicle.server.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chelvc.cloud.vehicle.server.dao.OmsOrderPayHistoryMapper;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrderPayHistory;
+import com.chelvc.cloud.vehicle.server.service.OmsOrderPayHistoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistoryMapper, OmsOrderPayHistory> implements OmsOrderPayHistoryService {
+
+    @Override
+    public Long queryNewInformNum(Long userId) {
+        LambdaQueryWrapper<OmsOrderPayHistory> lwq = Wrappers.lambdaQuery();
+        lwq.eq(OmsOrderPayHistory::getUserId, userId);
+        lwq.eq(OmsOrderPayHistory::getFlag, 0);
+        return baseMapper.selectCount(lwq);
+    }
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.constant.CouponClaimType;
@@ -141,6 +142,14 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         return userCoupon.getId();
     }
 
+    @Override
+    public Long queryNewInformNum(Long userId) {
+        LambdaQueryWrapper<UserCoupon> lwq = Wrappers.lambdaQuery();
+        lwq.eq(UserCoupon::getUserId, userId);
+        lwq.eq(UserCoupon::getUsed, 0);
+        return baseMapper.selectCount(lwq);
+    }
+
     /**
      * 检查该用户可领取的优惠券的数量
      *