fix: 移除@Resource注解，修复权限更新后，登录用户权限没有更新问题。

2023-06-06 17:26:04 +08:00
parent b61a5e8f7b
commit 5d6e99dc8a
35 changed files with 276 additions and 189 deletions
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
@@ -3,14 +3,12 @@ package cn.lili.timetask.handler.impl.goods;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.lili.modules.goods.mapper.GoodsMapper;
-import cn.lili.modules.member.entity.dos.MemberEvaluation;
-import cn.lili.modules.member.mapper.MemberEvaluationMapper;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.member.service.MemberEvaluationService;
 import cn.lili.timetask.handler.EveryDayExecute;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;

@@ -25,13 +23,13 @@ public class GoodsExecute implements EveryDayExecute {
    /**
     * 会员评价
     */
-    @Resource
-    private MemberEvaluationMapper memberEvaluationMapper;
+    @Autowired
+    private MemberEvaluationService memberEvaluationService;
    /**
     * 商品
     */
-    @Resource
-    private GoodsMapper goodsMapper;
+    @Autowired
+    private GoodsService goodsService;

    /**
     * 查询已上架的商品的评价数量并赋值
@@ -40,12 +38,10 @@ public class GoodsExecute implements EveryDayExecute {
    public void execute() {

        //查询上次统计到本次的评价数量
-        List<Map<String, Object>> list = memberEvaluationMapper.memberEvaluationNum(
-                new QueryWrapper<MemberEvaluation>()
-                        .between("create_time", DateUtil.yesterday(), new DateTime()));
+        List<Map<String, Object>> list = memberEvaluationService.memberEvaluationNum(DateUtil.yesterday(), new DateTime());

        for (Map<String, Object> map : list) {
-            goodsMapper.addGoodsCommentNum(Convert.toInt(map.get("num").toString()), map.get("goods_id").toString());
+            goodsService.addGoodsCommentNum(Convert.toInt(map.get("num").toString()), map.get("goods_id").toString());
        }

    }
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java
@@ -15,7 +15,6 @@ import cn.lili.modules.order.order.entity.enums.CommentStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.order.order.mapper.OrderItemMapper;
 import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.system.entity.dos.Setting;
@@ -24,13 +23,11 @@ import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
 import cn.lili.timetask.handler.EveryDayExecute;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;

@@ -53,8 +50,6 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
     */
    @Autowired
    private OrderItemService orderItemService;
-    @Resource
-    private OrderItemMapper orderItemMapper;
    /**
     * 设置
     */
@@ -148,10 +143,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
        DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation());

        //订单完成时间 <= 订单自动好评时间
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.le("o.complete_time", receiveTime);
-        queryWrapper.eq("oi.comment_status", CommentStatusEnum.UNFINISHED.name());
-        List<OrderItem> orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper);
+        List<OrderItem> orderItems = orderItemService.waitOperationOrderItem(receiveTime, CommentStatusEnum.UNFINISHED.name());

        //判断是否有符合条件的订单，进行自动评价处理
        if (!orderItems.isEmpty()) {
@@ -191,10 +183,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
        DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseAfterSale());

        //关闭售后订单=未售后订单+小于订单关闭售后申请时间
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.le("o.complete_time", receiveTime);
-        queryWrapper.eq("oi.after_sale_status", OrderItemAfterSaleStatusEnum.NOT_APPLIED.name());
-        List<OrderItem> orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper);
+        List<OrderItem> orderItems = orderItemService.waitOperationOrderItem(receiveTime, OrderItemAfterSaleStatusEnum.NOT_APPLIED.name());

        //判断是否有符合条件的订单，关闭允许售后申请处理
        if (!orderItems.isEmpty()) {
@@ -235,10 +224,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
        DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getCloseComplaint());

        //关闭售后订单=未售后订单+小于订单关闭售后申请时间
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.le("o.complete_time", receiveTime);
-        queryWrapper.eq("oi.complain_status", OrderComplaintStatusEnum.NO_APPLY.name());
-        List<OrderItem> orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper);
+        List<OrderItem> orderItems = orderItemService.waitOperationOrderItem(receiveTime, OrderComplaintStatusEnum.NO_APPLY.name());

        //判断是否有符合条件的订单，关闭允许售后申请处理
        if (!orderItems.isEmpty()) {
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/store/StoreRatingExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/store/StoreRatingExecute.java
@@ -1,9 +1,8 @@
 package cn.lili.timetask.handler.impl.store;

 import cn.lili.common.enums.SwitchEnum;
-import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.entity.vo.StoreRatingVO;
-import cn.lili.modules.member.mapper.MemberEvaluationMapper;
+import cn.lili.modules.member.service.MemberEvaluationService;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.enums.StoreStatusEnum;
 import cn.lili.modules.store.service.StoreService;
@@ -14,7 +13,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

-import javax.annotation.Resource;
 import java.util.List;

 /**
@@ -33,8 +31,8 @@ public class StoreRatingExecute implements EveryDayExecute {
    /**
     * 会员评价
     */
-    @Resource
-    private MemberEvaluationMapper memberEvaluationMapper;
+    @Autowired
+    private MemberEvaluationService memberEvaluationService;


    @Override
@@ -43,10 +41,7 @@ public class StoreRatingExecute implements EveryDayExecute {
        List<Store> storeList = storeService.list(new LambdaQueryWrapper<Store>().eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name()));
        for (Store store : storeList) {
            //店铺所有开启的评价
-            LambdaQueryWrapper<MemberEvaluation> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
-            lambdaQueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
-            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(lambdaQueryWrapper);
+            StoreRatingVO storeRatingVO = memberEvaluationService.getStoreRatingVO(store.getId(), SwitchEnum.OPEN.name());

            if (storeRatingVO != null) {
                //保存评分