修改

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/SystemInformType.java

@@ -0,0 +1,25 @@
+package com.chelvc.cloud.vehicle.api.constant;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 系统通知类型
+ */
+
+@Getter
+@AllArgsConstructor
+public enum SystemInformType {
+
+    ORDER(1, "新订单通知"),
+    EVALUATE(2, "新点赞通知"),
+    COUPON(3, "新优惠券通知"),
+    COMMENT(4, "新评价通知"),
+    PAY(5, "新付款通知"),
+    ;
+
+    private Integer value;
+
+    private String desc;
+}

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

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.api.service;
 
+import com.chelvc.cloud.vehicle.api.constant.SystemInformType;
 import com.chelvc.cloud.vehicle.api.dto.*;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
@@ -15,10 +16,10 @@ public interface InformService {
     Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging);
 
     /**
-     * 将新订单通知标识更改
+     * 将新系统通知标识未读改为已读
      *
      */
-    void changeUserOrderInformFlag(Long userId);
+    void changeSystemInformFlag(SystemInformType type, Long userId);
 
     /**
      * 查看是否有系统新消息
@@ -32,13 +33,7 @@ public interface InformService {
      * @param paging 分页信息
      * @return 用户的订单通知列表
      */
-    Pagination<OmsOrderPayHistoryDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging);
-
-    /**
-     * 将新订单通知标识更改
-     *
-     */
-    void changeUserPayInformFlag(Long userId);
+    Pagination<OmsOrderDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging);
 
     /**
      * 取用户的点赞回复通知列表
@@ -48,12 +43,6 @@ public interface InformService {
      */
     Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging);
 
-    /**
-     * 将新点赞回复通知标识更改
-     *
-     */
-    void changeEvaluateInformFlag(Long userId);
-
     /**
      * 取用户的评价通知列表
      *
@@ -62,12 +51,6 @@ public interface InformService {
      */
     Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging);
 
-    /**
-     * 将新评价通知标识更改
-     *
-     */
-    void changeCommentInformFlag(Long userId);
-
     /**
      * 取用户的优惠券通知列表
      *
@@ -75,10 +58,4 @@ public interface InformService {
      * @return 用户的评价通知列表
      */
     Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging);
-
-    /**
-     * 将优惠券通知标识更改
-     *
-     */
-    void changeUserCouponInformFlag(Long userId);
 }

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

@@ -1,9 +1,16 @@
 package com.chelvc.cloud.vehicle.server.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderPayHistory;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface OmsOrderPayHistoryMapper extends BaseMapper<OmsOrderPayHistory> {
+    IPage<OmsOrderDTO> selectOmsOrderPayHistoryListByUserId(@Param("page") Page<OmsOrderDTO> page, @Param(Constants.WRAPPER) QueryWrapper<OmsOrderPayHistory> queryWrapper);
 }

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

@@ -1,5 +1,9 @@
 package com.chelvc.cloud.vehicle.server.service;
 
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+
 public interface OmsOrderPayHistoryService {
 
     /**
@@ -14,4 +18,12 @@ public interface OmsOrderPayHistoryService {
      * @param userId 用户id
      */
     void changeUserPayInformFlag(Long userId);
+
+    /**
+     * 查看支付信息
+     * @param userId
+     * @param paging
+     * @return
+     */
+    Pagination<OmsOrderDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging);
 }

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

@@ -47,10 +47,10 @@ public class AttentionServiceImpl implements AttentionService {
 
   @Override
   public void concern(Long userId, Long targetUserId) {
-    if (userId == null || userId.equals(targetUserId)) {
+   if (userId == null || userId.equals(targetUserId)) {
       throw new ResourceUnavailableException("不能自己关注自己");
     }
-    LambdaQueryWrapper<Attention> wrapper = Wrappers.lambdaQuery();
+    /* LambdaQueryWrapper<Attention> wrapper = Wrappers.lambdaQuery();
     wrapper.eq(Attention::getUserId, userId);
     wrapper.eq(Attention::getTarget, targetUserId);
     Attention attention = attentionMapper.selectOne(wrapper);
@@ -68,8 +68,8 @@ public class AttentionServiceImpl implements AttentionService {
     int insert = attentionMapper.insert(attention);
     if(insert != 1){
       throw new ResourceUnavailableException("关注失败");
-    }
-    /*boolean attention = attention(userId, targetUserId);
+    }*/
+    boolean attention = attention(userId, targetUserId);
     fans(targetUserId, userId, attention);
     boolean b = checkAttention(targetUserId, userId);
     if(attention && b){
@@ -80,7 +80,7 @@ public class AttentionServiceImpl implements AttentionService {
     } else if (!attention && b) {
       redisTemplate.opsForZSet().remove(getFriendCacheKey(userId), targetUserId);
       redisTemplate.opsForZSet().remove(getFriendCacheKey(targetUserId), userId);
-    }*/
+    }
   }
 
   public boolean checkAttention(Long userId, Long targetUserId){

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

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.chelvc.cloud.vehicle.api.constant.SystemInformType;
 import com.chelvc.cloud.vehicle.api.dto.*;
 import com.chelvc.cloud.vehicle.api.service.InformService;
 import com.chelvc.cloud.vehicle.server.service.UserCouponService;
@@ -35,8 +36,19 @@ public class InformServiceImpl implements InformService {
     }
 
     @Override
-    public void changeUserOrderInformFlag(Long userId) {
-        omsOrderOperateHistoryService.changeUserOrderInformFlag(userId);
+    public void changeSystemInformFlag(SystemInformType type, Long userId) {
+        switch (type){
+            case PAY:
+                omsOrderPayHistoryService.changeUserPayInformFlag(userId);
+            case ORDER:
+                omsOrderOperateHistoryService.changeUserOrderInformFlag(userId);
+            case COUPON:
+                userCouponService.changeUserCouponInformFlag(userId);
+            case COMMENT:
+                commentService.changeCommentInformFlag(userId);
+            case EVALUATE:
+                dynamicEvaluateRecordService.changeEvaluateInformFlag(userId);
+        }
     }
 
     @Override
@@ -56,13 +68,8 @@ public class InformServiceImpl implements InformService {
     }
 
     @Override
-    public Pagination<OmsOrderPayHistoryDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging) {
-        return null;
-    }
-
-    @Override
-    public void changeUserPayInformFlag(Long userId) {
-        omsOrderPayHistoryService.changeUserPayInformFlag(userId);
+    public Pagination<OmsOrderDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging) {
+        return omsOrderPayHistoryService.selectOmsOrderPayHistoryListByUserId(userId, paging);
     }
 
     @Override
@@ -70,28 +77,13 @@ public class InformServiceImpl implements InformService {
         return dynamicEvaluateRecordService.selectEvaluateListByUserId(userId, paging);
     }
 
-    @Override
-    public void changeEvaluateInformFlag(Long userId) {
-        dynamicEvaluateRecordService.changeEvaluateInformFlag(userId);
-    }
-
     @Override
     public Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging) {
         return commentService.selectCommentListByUserId(userId, paging);
     }
 
-    @Override
-    public void changeCommentInformFlag(Long userId) {
-        commentService.changeCommentInformFlag(userId);
-    }
-
     @Override
     public Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging) {
         return userCouponService.selectUserCouponListByUserId(userId, paging);
     }
-
-    @Override
-    public void changeUserCouponInformFlag(Long userId) {
-        userCouponService.changeUserCouponInformFlag(userId);
-    }
 }

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

@@ -1,17 +1,38 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.DynamicContentDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderPayHistoryDTO;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderPayHistoryMapper;
+import com.chelvc.cloud.vehicle.server.entity.DynamicContent;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrderOperateHistory;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderPayHistory;
+import com.chelvc.cloud.vehicle.server.service.IOmsOrderService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderPayHistoryService;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.database.util.PagingUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistoryMapper, OmsOrderPayHistory> implements OmsOrderPayHistoryService {
 
+    private final IOmsOrderService omsOrderService;
+
     @Override
     public Integer queryNewInformNum(Long userId) {
         LambdaQueryWrapper<OmsOrderPayHistory> lwq = Wrappers.lambdaQuery();
@@ -28,4 +49,19 @@ public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistor
         lwq.set(OmsOrderPayHistory::getFlag, 1);
         baseMapper.update(null, lwq);
     }
+
+    @Override
+    public Pagination<OmsOrderDTO> selectOmsOrderPayHistoryListByUserId(Long userId, Paging paging) {
+        Page<OmsOrderDTO> page = new Page<>(paging.getIndex(), paging.getSize());
+        IPage<OmsOrderDTO> result = baseMapper.selectOmsOrderPayHistoryListByUserId(page, queryWrapper(userId));
+        return Pagination.<OmsOrderDTO>builder().total(result.getTotal()).pages(result.getPages())
+                .records(result.getRecords()).build();
+    }
+
+    private QueryWrapper<OmsOrderPayHistory> queryWrapper(Long userId) {
+        QueryWrapper<OmsOrderPayHistory> lqw = Wrappers.query();
+        lqw.eq("t1.user_id", userId);
+        lqw.orderByDesc("t1.create_time","t1.id");
+        return lqw;
+    }
 }

vehicle-server/src/main/resources/mapper/OmsOrderPayHistoryMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chelvc.cloud.vehicle.server.dao.OmsOrderPayHistoryMapper">
+
+
+    <select id="selectOmsOrderPayHistoryListByUserId" resultType="com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO">
+        select t2.*
+        from oms_order_pay_history t1
+        left join oms_order t2 on t1.order_id = t2.id
+        ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>