系统通知状态更改

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

@@ -0,0 +1,13 @@
+package com.chelvc.cloud.vehicle.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EvaluateDTO implements Serializable {
+
+    private static final long serialVersionUID = 2178904797700518635L;
+
+
+}

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

@@ -0,0 +1,13 @@
+package com.chelvc.cloud.vehicle.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OmsOrderPayHistoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private OmsOrderDTO omsOrderDTO;
+}

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

@@ -1,14 +1,13 @@
 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.cloud.vehicle.api.dto.*;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 
 public interface InformService {
 
     /**
-     * 获取用户的订单列表
+     * 获取用户的订单通知列表
      *
      * @param paging 分页信息
      * @return 用户的订单列表
@@ -26,4 +25,60 @@ public interface InformService {
      *
      */
     NewInformDTO getNewInform(Long userId);
+
+    /**
+     * 获取用户的支付通知列表
+     *
+     * @param paging 分页信息
+     * @return 用户的订单通知列表
+     */
+    Pagination<OmsOrderPayHistoryDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging);
+
+    /**
+     * 将新订单通知标识更改
+     *
+     */
+    void changeUserPayInformFlag(Long userId);
+
+    /**
+     * 取用户的点赞回复通知列表
+     *
+     * @param paging 分页信息
+     * @return 用户的订单通知列表
+     */
+    Pagination<OmsOrderPayHistoryDTO> selectEvaluateListByUserId(Long userId, Paging paging);
+
+    /**
+     * 将新点赞回复通知标识更改
+     *
+     */
+    void changeEvaluateInformFlag(Long userId);
+
+    /**
+     * 取用户的评价通知列表
+     *
+     * @param paging 分页信息
+     * @return 用户的评价通知列表
+     */
+    Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging);
+
+    /**
+     * 将新评价通知标识更改
+     *
+     */
+    void changeCommentInformFlag(Long userId);
+
+    /**
+     * 取用户的优惠券通知列表
+     *
+     * @param paging 分页信息
+     * @return 用户的评价通知列表
+     */
+    Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging);
+
+    /**
+     * 将优惠券通知标识更改
+     *
+     */
+    void changeUserCouponInformFlag(Long userId);
 }

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

@@ -71,11 +71,4 @@ 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/entity/Coupon.java

@@ -1,7 +1,5 @@
 package com.chelvc.cloud.vehicle.server.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,13 +8,11 @@ import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
 import com.chelvc.cloud.vehicle.api.constant.CouponType;
 import com.chelvc.cloud.vehicle.api.constant.PromotionStatus;
 import com.chelvc.framework.database.entity.ModifyEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import java.util.Date;
+
 /**
  * 优惠券数据模型
  *

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

@@ -56,4 +56,9 @@ public class UserCoupon extends ModifyEntity<Long> {
      */
     @TableField(exist = false)
     private Coupon coupon;
+
+    /**
+     * 标识：0-新消息；1-已查看
+     */
+    private Integer flag;
 }

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

@@ -29,4 +29,11 @@ public interface CommentService extends IService<Comment> {
      * @return
      */
     Long queryNewInformNum(Long userId);
+
+    /**
+     * 将评价通知标识更改
+     *
+     * @param userId 用户id
+     */
+    void changeCommentInformFlag(Long userId);
 }

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

@@ -25,4 +25,11 @@ public interface DynamicEvaluateRecordService {
      * @return
      */
     Long queryNewInformNum(Long userId);
+
+    /**
+     * 将新点赞回复通知标识更改
+     *
+     * @param userId 用户id
+     */
+    void changeEvaluateInformFlag(Long userId);
 }

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

@@ -7,4 +7,11 @@ public interface OmsOrderPayHistoryService {
      * @param userId
      */
     Long queryNewInformNum(Long userId);
+
+    /**
+     * 将新支付通知标识更改
+     *
+     * @param userId 用户id
+     */
+    void changeUserPayInformFlag(Long userId);
 }

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

@@ -10,4 +10,18 @@ import com.chelvc.cloud.vehicle.server.entity.UserCoupon;
  * @date 2023/7/17
  */
 public interface UserCouponService extends IService<UserCoupon> {
+
+    /**
+     * 查询可使用优惠券数量
+     * @param userId
+     * @return
+     */
+    Long queryNewInformNum(Long userId);
+
+    /**
+     * 将新优惠券通知标识更改
+     *
+     * @param userId 用户id
+     */
+    void changeUserCouponInformFlag(Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
@@ -53,4 +54,13 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         lwq.eq(Comment::getFlag, 0);
         return baseMapper.selectCount(lwq);
     }
+
+    @Override
+    public void changeCommentInformFlag(Long userId) {
+        LambdaUpdateWrapper<Comment> lwq = Wrappers.lambdaUpdate();
+        lwq.eq(Comment::getUserId, userId);
+        lwq.eq(Comment::getFlag, 0);
+        lwq.set(Comment::getFlag, 1);
+        baseMapper.update(null, lwq);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chelvc.cloud.vehicle.api.constant.ActionType;
 import com.chelvc.cloud.vehicle.api.constant.RecordType;
@@ -102,6 +103,15 @@ public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordSe
     return baseMapper.selectCount(lwq);
   }
 
+  @Override
+  public void changeEvaluateInformFlag(Long userId) {
+    LambdaUpdateWrapper<DynamicEvaluateRecord> lwq = Wrappers.lambdaUpdate();
+    lwq.eq(DynamicEvaluateRecord::getTargetUserId, userId);
+    lwq.eq(DynamicEvaluateRecord::getFlag, 0);
+    lwq.set(DynamicEvaluateRecord::getFlag, 1);
+    baseMapper.update(null, lwq);
+  }
+
   /**
    * 判断该用户是否有点赞/踩记录，点击新增记录，取消删除记录
    * @param lqw

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

@@ -1,14 +1,12 @@
 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.dto.*;
 import com.chelvc.cloud.vehicle.api.service.InformService;
-import com.chelvc.cloud.vehicle.api.service.UserCouponService;
+import com.chelvc.cloud.vehicle.server.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;
@@ -36,7 +34,7 @@ public class InformServiceImpl implements InformService {
 
     @Override
     public void changeUserOrderInformFlag(Long userId) {
-        omsOrderOperateHistoryService.changeUserOrderInformFlag(SessionContextHolder.getId());
+        omsOrderOperateHistoryService.changeUserOrderInformFlag(userId);
     }
 
     @Override
@@ -54,4 +52,44 @@ public class InformServiceImpl implements InformService {
         newInformDTO.setComment(comment);
         return newInformDTO;
     }
+
+    @Override
+    public Pagination<OmsOrderPayHistoryDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging) {
+        return null;
+    }
+
+    @Override
+    public void changeUserPayInformFlag(Long userId) {
+        omsOrderPayHistoryService.changeUserPayInformFlag(userId);
+    }
+
+    @Override
+    public Pagination<OmsOrderPayHistoryDTO> selectEvaluateListByUserId(Long userId, Paging paging) {
+        return null;
+    }
+
+    @Override
+    public void changeEvaluateInformFlag(Long userId) {
+        dynamicEvaluateRecordService.changeEvaluateInformFlag(userId);
+    }
+
+    @Override
+    public Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging) {
+        return null;
+    }
+
+    @Override
+    public void changeCommentInformFlag(Long userId) {
+        commentService.changeCommentInformFlag(userId);
+    }
+
+    @Override
+    public Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging) {
+        return null;
+    }
+
+    @Override
+    public void changeUserCouponInformFlag(Long userId) {
+        userCouponService.changeUserCouponInformFlag(userId);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderPayHistoryServiceImpl.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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderPayHistoryMapper;
@@ -18,4 +19,13 @@ public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistor
         lwq.eq(OmsOrderPayHistory::getFlag, 0);
         return baseMapper.selectCount(lwq);
     }
+
+    @Override
+    public void changeUserPayInformFlag(Long userId) {
+        LambdaUpdateWrapper<OmsOrderPayHistory> lwq = Wrappers.lambdaUpdate();
+        lwq.eq(OmsOrderPayHistory::getUserId, userId);
+        lwq.eq(OmsOrderPayHistory::getFlag, 0);
+        lwq.set(OmsOrderPayHistory::getFlag, 1);
+        baseMapper.update(null, 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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -146,10 +147,19 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     public Long queryNewInformNum(Long userId) {
         LambdaQueryWrapper<UserCoupon> lwq = Wrappers.lambdaQuery();
         lwq.eq(UserCoupon::getUserId, userId);
-        lwq.eq(UserCoupon::getUsed, 0);
+        lwq.eq(UserCoupon::getFlag, 0);
         return baseMapper.selectCount(lwq);
     }
 
+    @Override
+    public void changeUserCouponInformFlag(Long userId) {
+        LambdaUpdateWrapper<UserCoupon> lwq = Wrappers.lambdaUpdate();
+        lwq.eq(UserCoupon::getUserId, userId);
+        lwq.eq(UserCoupon::getFlag, 0);
+        lwq.set(UserCoupon::getFlag, 1);
+        baseMapper.update(null, lwq);
+    }
+
     /**
      * 检查该用户可领取的优惠券的数量
      *