Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

2021-11-08 16:21:12 +08:00
parent d877a24dec 5eded10d19
commit 3dbc340e6d
144 changed files with 204 additions and 2252 deletions
--- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
@@ -3,7 +3,7 @@ package cn.lili.event.impl;
 import cn.lili.event.TradeEvent;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.order.service.TradeService;
-import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

--- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
@@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.Payment;
-import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
@@ -1,5 +1,6 @@
 package cn.lili.timetask.handler.impl.coupon;

+import cn.lili.common.utils.DateUtil;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 import cn.lili.modules.promotion.service.MemberCouponService;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

+import java.util.Calendar;
 import java.util.Date;

 /**
@@ -22,7 +24,7 @@ public class CouponExecute implements EveryDayExecute {
    /**
     * 过期常量，过期后或者使用后一定时间内，删除无效的优惠券，物理删除
     */
-    static final int EXPIRATION_DAY = 7;
+    static final int EXPIRATION_DAY = 3;

    @Autowired
    private MemberCouponService memberCouponService;
@@ -40,12 +42,16 @@ public class CouponExecute implements EveryDayExecute {
                .set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.EXPIRE.name());
        this.memberCouponService.update(updateWrapper);

+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + EXPIRATION_DAY);
+        Date removeTime = calendar.getTime();
        //删除过期/已使用的优惠券
        LambdaUpdateWrapper<MemberCoupon> deleteWrapper = new LambdaUpdateWrapper<MemberCoupon>()
                //如果结束时间小于 当前时间增加指定删除日期，则删除
-                .le(MemberCoupon::getEndTime, System.currentTimeMillis() + 24 * 60 * 60 * 1000 * EXPIRATION_DAY);
+                .le(MemberCoupon::getEndTime, removeTime);
        this.memberCouponService.remove(deleteWrapper);

+
    }

 }
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
@@ -1,6 +1,6 @@
 package cn.lili.timetask.handler.impl.statistics;

-import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
+import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
 import cn.lili.modules.statistics.service.MemberStatisticsDataService;
 import cn.lili.timetask.handler.EveryDayExecute;
 import lombok.extern.slf4j.Slf4j;
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
@@ -4,7 +4,7 @@ import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.properties.StatisticsProperties;
-import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
+import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
 import cn.lili.timetask.handler.EveryHourExecute;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,7 +28,7 @@ public class OnlineMemberStatistics implements EveryHourExecute {
     * 缓存
     */
    @Autowired
-    private Cache cache;
+    private Cache<List<OnlineMemberVO>> cache;
    /**
     * 统计小时
     */
@@ -41,12 +41,10 @@ public class OnlineMemberStatistics implements EveryHourExecute {

        Calendar calendar = Calendar.getInstance();

-        Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
-        List<OnlineMemberVO> onlineMemberVOS;
-        if (object == null) {
+        List<OnlineMemberVO> onlineMemberVOS = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
+
+        if (onlineMemberVOS == null) {
            onlineMemberVOS = new ArrayList<>();
-        } else {
-            onlineMemberVOS = (List<OnlineMemberVO>) object;
        }

        //过滤 有效统计时间
@@ -80,12 +78,10 @@ public class OnlineMemberStatistics implements EveryHourExecute {
     */
    public void execute(Date time, Integer num) {

-        Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
-        List<OnlineMemberVO> onlineMemberVOS;
-        if (object == null) {
+        List<OnlineMemberVO> onlineMemberVOS = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
+
+        if (onlineMemberVOS == null) {
            onlineMemberVOS = new ArrayList<>();
-        } else {
-            onlineMemberVOS = (List<OnlineMemberVO>) object;
        }

        Calendar calendar = Calendar.getInstance();
@@ -96,9 +92,8 @@ public class OnlineMemberStatistics implements EveryHourExecute {
        calendar.set(Calendar.MILLISECOND, 0);
        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - 48);

-        Calendar finalCalendar = calendar;
        onlineMemberVOS = onlineMemberVOS.stream()
-                .filter(onlineMemberVO -> onlineMemberVO.getDate().after(finalCalendar.getTime()))
+                .filter(onlineMemberVO -> onlineMemberVO.getDate().after(calendar.getTime()))
                .collect(Collectors.toList());
        onlineMemberVOS.add(new OnlineMemberVO(time, num));

--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
@@ -4,7 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.modules.statistics.model.dos.PlatformViewData;
+import cn.lili.modules.statistics.entity.dos.PlatformViewData;
 import cn.lili.modules.statistics.service.PlatformViewDataService;
 import cn.lili.timetask.handler.EveryDayExecute;
 import lombok.Data;
--- a/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java
+++ b/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java
@@ -3,7 +3,7 @@ package cn.lili.buyer.test.cart;
 import cn.lili.event.impl.StockUpdateExecute;
 import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;