commit message

consumer/src/main/java/cn/lili/timetask/TimedTaskJobHandler.java

@@ -0,0 +1,104 @@
+package cn.lili.timetask;
+
+import cn.lili.timetask.handler.EveryDayExecute;
+import cn.lili.timetask.handler.EveryHourExecute;
+import cn.lili.timetask.handler.EveryMinuteExecute;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 定时器任务
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2020-12-24 11:51
+ */
+@Slf4j
+@Component
+public class TimedTaskJobHandler {
+
+    @Autowired(required = false)
+    private List<EveryMinuteExecute> everyMinuteExecutes;
+
+
+    @Autowired(required = false)
+    private List<EveryHourExecute> everyHourExecutes;
+
+
+    @Autowired(required = false)
+    private List<EveryDayExecute> everyDayExecutes;
+
+    /**
+     * 每分钟任务
+     *
+     * @throws Exception
+     */
+    @XxlJob("everyMinuteExecute")
+    public ReturnT<String> everyMinuteExecute(String param)  {
+        log.info("每分钟任务执行");
+        if (everyMinuteExecutes == null || everyMinuteExecutes.size() == 0) {
+            return ReturnT.SUCCESS;
+        }
+
+        for (int i = 0; i < everyMinuteExecutes.size(); i++) {
+            try {
+                everyMinuteExecutes.get(i).execute();
+            } catch (Exception e) {
+                log.error("每分钟任务异常", e);
+            }
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 每小时任务
+     *
+     * @throws Exception
+     */
+    @XxlJob("everyHourExecuteJobHandler")
+    public ReturnT<String> everyHourExecuteJobHandler(String param) {
+        log.info("每小时任务执行");
+        if (everyHourExecutes == null || everyHourExecutes.size() == 0) {
+            return ReturnT.SUCCESS;
+        }
+
+        for (int i = 0; i < everyHourExecutes.size(); i++) {
+            try {
+                everyHourExecutes.get(i).execute();
+            } catch (Exception e) {
+                log.error("每分钟任务异常", e);
+            }
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 每日任务
+     *
+     * @throws Exception
+     */
+    @XxlJob("everyDayExecuteJobHandler")
+    public ReturnT<String> everyDayExecuteJobHandler(String param) {
+
+        log.info("每日任务执行");
+        if (everyDayExecutes == null || everyDayExecutes.size() == 0) {
+            return ReturnT.SUCCESS;
+        }
+
+        for (int i = 0; i < everyDayExecutes.size(); i++) {
+            try {
+                everyDayExecutes.get(i).execute();
+            } catch (Exception e) {
+                log.error("每分钟任务异常", e);
+            }
+        }
+        return ReturnT.SUCCESS;
+    }
+
+
+}

consumer/src/main/java/cn/lili/timetask/config/XxlJobConfig.java

@@ -0,0 +1,78 @@
+package cn.lili.timetask.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+    private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+    @Value("${xxl.job.admin.addresses:}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.accessToken:}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.address}")
+    private String address;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setAddress(address);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}

consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java

@@ -0,0 +1,18 @@
+package cn.lili.timetask.handler;
+
+/**
+ * 每日任务
+ * 每日凌晨1点执行
+ *
+ * @author Chopper
+ * @date 2020/12/24 11:52
+ */
+public interface EveryDayExecute {
+
+    /**
+     * 执行每日任务
+     */
+    void execute();
+
+
+}

consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java

@@ -0,0 +1,17 @@
+package cn.lili.timetask.handler;
+
+/**
+ * 每小时任务
+ *
+ * @author Chopper
+ * @date 2020/12/24 11:52
+ */
+public interface EveryHourExecute {
+
+    /**
+     * 执行
+     */
+    void execute();
+
+
+}

consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java

@@ -0,0 +1,17 @@
+package cn.lili.timetask.handler;
+
+/**
+ * 每分钟任务
+ *
+ * @author Chopper
+ * @date 2020/12/24 11:52
+ */
+public interface EveryMinuteExecute {
+
+    /**
+     * 执行
+     */
+    void execute();
+
+
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java

@@ -0,0 +1,54 @@
+package cn.lili.timetask.handler.impl.bill;
+
+import cn.hutool.core.date.DateUtil;
+import cn.lili.modules.store.entity.dto.StoreSettlementDay;
+import cn.lili.modules.store.mapper.StoreDetailMapper;
+import cn.lili.modules.store.service.BillService;
+import cn.lili.timetask.handler.EveryDayExecute;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 店铺结算执行
+ *
+ * @author Bulbasaur
+ * @date 2021/2/18 3:45 下午
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class BillExecute implements EveryDayExecute {
+
+    //结算单
+    private final BillService billService;
+    //店铺详情
+    private final StoreDetailMapper storeDetailMapper;
+
+    /**
+     * 1.查询今日待结算的商家
+     * 2.查询商家上次结算日期，生成本次结算单
+     * 3.记录商家结算日
+     */
+    @Override
+    public void execute() {
+
+        //获取当前时间的前一天
+        String day = "," + DateUtil.date().dayOfMonth() + ",";
+
+        //获取待结算商家列表
+        List<StoreSettlementDay> storeList = storeDetailMapper.getSettlementStore(new QueryWrapper<StoreSettlementDay>().like("settlement_cycle", day));
+
+        //批量商家结算
+        for (StoreSettlementDay storeSettlementDay : storeList) {
+
+            //生成结算单
+            billService.createBill(storeSettlementDay.getStoreId(), storeSettlementDay.getSettlementDay());
+
+            //修改店铺结算时间
+            storeDetailMapper.updateSettlementDay(storeSettlementDay.getStoreId(), DateUtil.date());
+        }
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java

@@ -0,0 +1,48 @@
+package cn.lili.timetask.handler.impl.goods;
+
+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.timetask.handler.EveryDayExecute;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商品定时器
+ *
+ * @author Chopper
+ * @date 2021/3/18 3:23 下午
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class GoodsExecute implements EveryDayExecute {
+    //会员评价
+    private final MemberEvaluationMapper memberEvaluationMapper;
+    //商品
+    private final GoodsMapper goodsMapper;
+
+    /**
+     * 查询已上架的商品的评价数量并赋值
+     */
+    @Override
+    public void execute() {
+
+        //查询上次统计到本次的评价数量
+        List<Map<String, Object>> list = memberEvaluationMapper.memberEvaluationNum(
+                new QueryWrapper<MemberEvaluation>()
+                        .between("create_time", DateUtil.yesterday(), new DateTime()));
+
+        System.out.println("评论数量" + list.size());
+        for (Map<String, Object> map : list) {
+            goodsMapper.addGoodsCommentNum(Integer.parseInt(map.get("num").toString()), map.get("goods_id").toString());
+        }
+
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java

@@ -0,0 +1,57 @@
+package cn.lili.timetask.handler.impl.order;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import cn.lili.modules.order.order.entity.dos.Order;
+import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
+import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.system.entity.dos.Setting;
+import cn.lili.modules.system.entity.dto.OrderSetting;
+import cn.lili.modules.system.entity.enums.SettingEnum;
+import cn.lili.modules.system.service.SettingService;
+import cn.lili.timetask.handler.EveryMinuteExecute;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单自动取消（每分钟执行）
+ *
+ * @author paulG
+ * @date 2021/3/11
+ **/
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class CancelOrderTaskExecute implements EveryMinuteExecute {
+    //订单
+    private final OrderService orderService;
+    //设置
+    private final SettingService settingService;
+
+
+    @Override
+    public void execute() {
+        Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name());
+        OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class);
+        if (orderSetting != null && orderSetting.getAutoCancel() != null) {
+            // 订单自动取消时间 = 当前时间 - 自动取消时间分钟数
+            DateTime cancelTime = DateUtil.offsetMinute(DateUtil.date(), -orderSetting.getAutoCancel());
+            LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.UNPAID.name());
+            // 订单创建时间 <= 订单自动取消时间
+            queryWrapper.le(Order::getCreateTime, cancelTime);
+            List<Order> list = orderService.list(queryWrapper);
+            List<String> cancelSnList = list.stream().map(Order::getSn).collect(Collectors.toList());
+            for (String sn : cancelSnList) {
+                orderService.systemCancel(sn, "超时未支付自动取消");
+            }
+        }
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -0,0 +1,121 @@
+package cn.lili.timetask.handler.impl.order;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.modules.member.entity.dto.MemberEvaluationDTO;
+import cn.lili.modules.member.entity.enums.EvaluationGradeEnum;
+import cn.lili.modules.member.service.MemberEvaluationService;
+import cn.lili.modules.order.order.entity.dos.Order;
+import cn.lili.modules.order.order.entity.dos.OrderItem;
+import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
+import cn.lili.modules.order.order.service.OrderItemService;
+import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.system.entity.dos.Setting;
+import cn.lili.modules.system.entity.dto.OrderSetting;
+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.update.LambdaUpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author paulG
+ * @since 2021/3/11
+ **/
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class OrderEveryDayTaskExecute implements EveryDayExecute {
+
+    //订单
+    private final OrderService orderService;
+    //订单货物
+    private final OrderItemService orderItemService;
+    //设置
+    private final SettingService settingService;
+    //会员评价
+    private final MemberEvaluationService memberEvaluationService;
+
+    /**
+     * 执行每日任务
+     */
+    @Override
+    public void execute() {
+        Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name());
+        //自动确认收货
+        OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class);
+        if (orderSetting == null) {
+            throw new ServiceException("系统配置异常");
+        }
+
+        //自动确认收货
+        completedOrder(orderSetting);
+        //自动好评
+        memberEvaluation(orderSetting);
+    }
+
+    /**
+     * 自动确认收获，订单完成
+     *
+     * @param orderSetting 订单设置
+     */
+    private void completedOrder(OrderSetting orderSetting) {
+        // 订单自动收货时间 = 当前时间 - 自动收货时间天数
+        DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation());
+        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.DELIVERED.name());
+        // 订单发货时间 >= 订单自动收货时间
+        queryWrapper.ge(Order::getLogisticsTime, receiveTime);
+        List<Order> list = orderService.list(queryWrapper);
+        List<String> receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList());
+        if (!receiveSnList.isEmpty()) {
+            LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.in(Order::getSn, receiveSnList);
+            updateWrapper.set(Order::getOrderStatus, OrderStatusEnum.COMPLETED.name()).set(Order::getCompleteTime, new Date());
+            boolean update = orderService.update(updateWrapper);
+            if (Boolean.FALSE.equals(update)) {
+                log.error("自动收货订单失败！订单编号为[{}]", receiveSnList);
+            }
+        }
+    }
+
+    /**
+     * 自动好评
+     *
+     * @param orderSetting 订单设置
+     */
+    private void memberEvaluation(OrderSetting orderSetting) {
+        // 订单自动收货时间 = 当前时间 - 自动收货时间天数
+        DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoReceive());
+        // 订单完成时间 <= 订单自动好评时间
+        List<OrderItem> orderItems = orderItemService.waitEvaluate(receiveTime);
+
+        for (OrderItem orderItem : orderItems) {
+
+            MemberEvaluationDTO memberEvaluationDTO = new MemberEvaluationDTO();
+            memberEvaluationDTO.setOrderItemSn(orderItem.getSn());
+            memberEvaluationDTO.setContent("系统默认好评");
+            memberEvaluationDTO.setGoodsId(orderItem.getGoodsId());
+            memberEvaluationDTO.setSkuId(orderItem.getSkuId());
+            memberEvaluationDTO.setGrade(EvaluationGradeEnum.GOOD.name());
+            memberEvaluationDTO.setDeliveryScore(5);
+            memberEvaluationDTO.setDescriptionScore(5);
+            memberEvaluationDTO.setServiceScore(5);
+
+            memberEvaluationService.addMemberEvaluation(memberEvaluationDTO);
+
+        }
+    }
+
+
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java

@@ -0,0 +1,131 @@
+package cn.lili.timetask.handler.impl.promotion;
+
+import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
+import cn.lili.modules.promotion.entity.dos.MemberCoupon;
+import cn.lili.modules.promotion.entity.dos.PromotionGoods;
+import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
+import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
+import cn.lili.modules.promotion.entity.vos.CouponVO;
+import cn.lili.modules.promotion.entity.vos.PintuanVO;
+import cn.lili.modules.promotion.service.*;
+import cn.lili.timetask.handler.EveryDayExecute;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 促销活动每日定时器
+ *
+ * @author Chopper
+ * @date 2021/3/18 3:23 下午
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class PromotionEverydayExecute implements EveryDayExecute {
+
+    //Mongo
+    private final MongoTemplate mongoTemplate;
+    //满额活动
+    private final FullDiscountService fullDiscountService;
+    //拼团
+    private final PintuanService pintuanService;
+    //优惠券
+    private final CouponService couponService;
+    //会员优惠券
+    private final MemberCouponService memberCouponService;
+    //促销商品
+    private final PromotionGoodsService promotionGoodsService;
+
+
+    /**
+     * 将已过期的促销活动置为结束
+     */
+    @Override
+    public void execute() {
+
+        Query query = new Query();
+        query.addCriteria(Criteria.where("promotionStatus").ne(PromotionStatusEnum.END.name()).orOperator(Criteria.where("promotionStatus").ne(PromotionStatusEnum.CLOSE.name())));
+        query.addCriteria(Criteria.where("endTime").lt(new Date()));
+
+        List<String> promotionIds = new ArrayList<>();
+
+        List<FullDiscountVO> fullDiscountVOS = mongoTemplate.find(query, FullDiscountVO.class);
+        if (!fullDiscountVOS.isEmpty()) {
+            List<String> ids = new ArrayList<>();
+            for (FullDiscountVO vo : fullDiscountVOS) {
+                vo.setPromotionStatus(PromotionStatusEnum.END.name());
+                if (vo.getPromotionGoodsList() != null && !vo.getPromotionGoodsList().isEmpty()) {
+                    for (PromotionGoods promotionGoods : vo.getPromotionGoodsList()) {
+                        promotionGoods.setPromotionStatus(PromotionStatusEnum.END.name());
+                    }
+                }
+                mongoTemplate.save(vo);
+                ids.add(vo.getId());
+            }
+            fullDiscountService.update(this.getUpdatePromotionWrapper(ids));
+            promotionIds.addAll(ids);
+        }
+
+        List<PintuanVO> pintuanVOS = mongoTemplate.find(query, PintuanVO.class);
+        if (!pintuanVOS.isEmpty()) {
+            List<String> ids = new ArrayList<>();
+            for (PintuanVO vo : pintuanVOS) {
+                vo.setPromotionStatus(PromotionStatusEnum.END.name());
+                if (vo.getPromotionGoodsList() != null && !vo.getPromotionGoodsList().isEmpty()) {
+                    for (PromotionGoods promotionGoods : vo.getPromotionGoodsList()) {
+                        promotionGoods.setPromotionStatus(PromotionStatusEnum.END.name());
+                    }
+                }
+                mongoTemplate.save(vo);
+                ids.add(vo.getId());
+            }
+            pintuanService.update(this.getUpdatePromotionWrapper(ids));
+            promotionIds.addAll(ids);
+        }
+
+        List<CouponVO> couponVOS = mongoTemplate.find(query, CouponVO.class);
+        if (!couponVOS.isEmpty()) {
+            List<String> ids = new ArrayList<>();
+            for (CouponVO vo : couponVOS) {
+                vo.setPromotionStatus(PromotionStatusEnum.END.name());
+                if (vo.getPromotionGoodsList() != null && !vo.getPromotionGoodsList().isEmpty()) {
+                    for (PromotionGoods promotionGoods : vo.getPromotionGoodsList()) {
+                        promotionGoods.setPromotionStatus(PromotionStatusEnum.END.name());
+                    }
+                }
+                mongoTemplate.save(vo);
+                ids.add(vo.getId());
+            }
+            couponService.update(this.getUpdatePromotionWrapper(ids));
+            LambdaUpdateWrapper<MemberCoupon> memberCouponLambdaUpdateWrapper = new LambdaUpdateWrapper<MemberCoupon>().in(MemberCoupon::getCouponId, ids).set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.EXPIRE.name());
+            memberCouponService.update(memberCouponLambdaUpdateWrapper);
+            promotionIds.addAll(ids);
+        }
+
+        promotionGoodsService.update(this.getUpdatePromotionGoodsWrapper(promotionIds));
+
+    }
+
+    private UpdateWrapper getUpdatePromotionWrapper(List<String> ids) {
+        UpdateWrapper updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", ids);
+        updateWrapper.set("promotion_status", PromotionStatusEnum.END.name());
+        return updateWrapper;
+    }
+
+    private UpdateWrapper getUpdatePromotionGoodsWrapper(List<String> ids) {
+        UpdateWrapper updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("promotion_id", ids);
+        updateWrapper.set("promotion_status", PromotionStatusEnum.END.name());
+        return updateWrapper;
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java

@@ -0,0 +1,71 @@
+package cn.lili.timetask.handler.impl.statistics;
+
+import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
+import cn.lili.modules.statistics.service.MemberStatisticsDataService;
+import cn.lili.timetask.handler.EveryDayExecute;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 会员数据统计
+ *
+ * @author Chopper
+ * @date 2021-03-02 14:56
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class MemberStatisticsExecute implements EveryDayExecute {
+
+    //会员统计
+    private final MemberStatisticsDataService memberStatisticsDataService;
+
+    @Override
+    public void execute() {
+
+        try {
+            //统计的时间（开始。结束时间）
+            Date startTime, endTime;
+            //初始值
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 1);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            endTime = calendar.getTime();
+            //-1天，即为开始时间
+            calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - 1);
+            startTime = calendar.getTime();
+            MemberStatisticsData memberStatisticsData = new MemberStatisticsData();
+            memberStatisticsData.setMemberCount(memberStatisticsDataService.memberCount(endTime));
+            memberStatisticsData.setCreateDate(startTime);
+            memberStatisticsData.setActiveQuantity(memberStatisticsDataService.activeQuantity(startTime));
+            memberStatisticsData.setNewlyAdded(memberStatisticsDataService.newlyAdded(startTime, endTime));
+            memberStatisticsDataService.save(memberStatisticsData);
+        } catch (Exception e) {
+            log.error("每日会员统计功能异常：", e);
+        }
+    }
+
+    public static void main(String[] args) {
+
+        //统计的时间（开始。结束时间）
+        Date startTime, endTime;
+        //初始值
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 1);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        endTime = calendar.getTime();
+        //-1天，即为开始时间
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - 1);
+        startTime = calendar.getTime();
+        System.out.println(startTime);
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java

@@ -0,0 +1,105 @@
+package cn.lili.timetask.handler.impl.statistics;
+
+import cn.lili.common.cache.Cache;
+import cn.lili.common.cache.CachePrefix;
+import cn.lili.common.security.enums.UserEnums;
+import cn.lili.config.properties.StatisticsProperties;
+import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
+import cn.lili.timetask.handler.EveryHourExecute;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 实时在线人数统计
+ *
+ * @author Chopper
+ * @date 2021-02-21 09:47
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class OnlineMemberStatistics implements EveryHourExecute {
+
+    //缓存
+    private final Cache cache;
+    //统计小时
+    private final StatisticsProperties statisticsProperties;
+
+
+    @Override
+    public void execute() {
+
+        Calendar calendar = Calendar.getInstance();
+
+        Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
+        List<OnlineMemberVO> onlineMemberVOS;
+        if (object == null) {
+            onlineMemberVOS = new ArrayList<>();
+        } else {
+            onlineMemberVOS = (List<OnlineMemberVO>) object;
+        }
+
+        //过滤 有效统计时间
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - statisticsProperties.getOnlineMember());
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        Calendar finalCalendar = calendar;
+        onlineMemberVOS = onlineMemberVOS.stream()
+                .filter(onlineMemberVO -> onlineMemberVO.getDate().after(finalCalendar.getTime()))
+                .collect(Collectors.toList());
+
+        //计入新数据
+        calendar = Calendar.getInstance();
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        onlineMemberVOS.add(new OnlineMemberVO(calendar.getTime(), cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size()));
+
+        //写入缓存
+        cache.put(CachePrefix.ONLINE_MEMBER.getPrefix(), onlineMemberVOS);
+    }
+
+
+    /**
+     * 手动设置某一时间，活跃人数
+     *
+     * @param time 时间
+     * @param num  人数
+     */
+    public void execute(Date time, Integer num) {
+
+        Object object = cache.get(CachePrefix.ONLINE_MEMBER.getPrefix());
+        List<OnlineMemberVO> onlineMemberVOS;
+        if (object == null) {
+            onlineMemberVOS = new ArrayList<>();
+        } else {
+            onlineMemberVOS = (List<OnlineMemberVO>) object;
+        }
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        //过滤 有效统计时间
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        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()))
+                .collect(Collectors.toList());
+        onlineMemberVOS.add(new OnlineMemberVO(time, num));
+
+        //写入缓存
+        cache.put(CachePrefix.ONLINE_MEMBER.getPrefix(), onlineMemberVOS);
+    }
+
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java

@@ -0,0 +1,60 @@
+package cn.lili.timetask.handler.impl.storeRating;
+
+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.store.entity.dos.Store;
+import cn.lili.modules.store.entity.enums.StoreStatusEnum;
+import cn.lili.modules.store.service.StoreService;
+import cn.lili.timetask.handler.EveryDayExecute;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 店铺评分
+ *
+ * @author Chopper
+ * @date 2021/3/15 5:30 下午
+ */
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class StoreRatingExecute implements EveryDayExecute {
+    //店铺
+    private final StoreService storeService;
+    //会员评价
+    private final MemberEvaluationMapper memberEvaluationMapper;
+
+
+    @Override
+    public void execute() {
+        //获取所有开启的店铺
+        List<Store> storeList = storeService.list(new LambdaQueryWrapper<Store>().eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name()));
+        for (Store store : storeList) {
+            //店铺所有开启的评价
+            LambdaQueryWrapper<MemberEvaluation> QueryWrapper = Wrappers.lambdaQuery();
+            QueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
+            QueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
+            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(QueryWrapper);
+
+            if (storeRatingVO != null) {
+                //保存评分
+                LambdaUpdateWrapper<Store> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                lambdaUpdateWrapper.eq(Store::getId, store.getId());
+                lambdaUpdateWrapper.set(Store::getDescriptionScore, storeRatingVO.getDescriptionScore());
+                lambdaUpdateWrapper.set(Store::getDeliveryScore, storeRatingVO.getDeliveryScore());
+                lambdaUpdateWrapper.set(Store::getServiceScore, storeRatingVO.getServiceScore());
+                storeService.update(lambdaUpdateWrapper);
+            }
+
+        }
+
+
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java

@@ -0,0 +1,192 @@
+package cn.lili.timetask.handler.impl.view;
+
+import cn.lili.common.cache.Cache;
+import cn.lili.common.cache.CachePrefix;
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.DateUtil;
+import cn.lili.modules.statistics.model.dos.PlatformViewData;
+import cn.lili.modules.statistics.service.PlatformViewDataService;
+import cn.lili.timetask.handler.EveryDayExecute;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 统计 入库
+ *
+ * @author Chopper
+ * @date 2021-01-15 18:20
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class PageViewStatisticsExecute implements EveryDayExecute {
+    //缓存
+    private final Cache cache;
+    //平台PV统计
+    private final PlatformViewDataService platformViewDataService;
+
+    @Override
+    public void execute() {
+
+        //1、缓存keys 模糊匹配
+        //2、过滤今日的数据，即今天只能统计今日以前的数据
+        //4对key value 分别代表平台PV、平台UV、店铺PV、店铺UV
+        List<String> pvKeys = filterKeys(cache.keys(CachePrefix.PV.getPrefix() + "*"));
+        List<Integer> pvValues = cache.multiGet(pvKeys);
+
+        List<String> storePVKeys = filterKeys(cache.keys(CachePrefix.STORE_PV.getPrefix() + "*"));
+        List<Integer> storePvValues = cache.multiGet(storePVKeys);
+
+        //备份UV数据，这里赋值之后，会被删除
+        List<String> uvKeys = new ArrayList<>();
+        List<String> storeUvKeys = new ArrayList<>();
+
+        log.debug("开始统计平台数据，PV共计【{}】条", pvKeys.size());
+        log.debug("开始统计店铺数据，PV共计【{}】条", storePvValues.size());
+
+        //定义要统计的数据
+        List<PlatformViewData> platformViewDataList = new ArrayList<>();
+
+        //PV 统计
+        if (pvKeys.size() > 0) {
+            for (int i = 0; i < pvKeys.size(); i++) {
+                String key = pvKeys.get(i);
+                PageViewStatistics pageViewStatistics = new PageViewStatistics(key);
+                PlatformViewData platformPVData = new PlatformViewData();
+                BeanUtil.copyProperties(pageViewStatistics, platformPVData);
+                platformPVData.setPvNum(pvValues.get(i).longValue());
+                //根据pvkey 获取 uvkey
+                String uvKey = getUvKey(key);
+                uvKeys.add(uvKey);
+                platformPVData.setUvNum(cache.counter(uvKey));
+                platformPVData.setStoreId("-1");
+                platformViewDataList.add(platformPVData);
+            }
+            batchSave(pvKeys, uvKeys, platformViewDataList);
+        }
+        //店铺 PV 统计
+        if (storePVKeys.size() > 0) {
+            platformViewDataList = new ArrayList<>();
+            for (int i = 0; i < storePVKeys.size(); i++) {
+                String key = storePVKeys.get(i);
+                PageViewStatistics pageViewStatistics = new PageViewStatistics(key);
+                PlatformViewData storePVData = new PlatformViewData();
+                BeanUtil.copyProperties(pageViewStatistics, storePVData);
+                storePVData.setPvNum(storePvValues.get(i).longValue());
+                //根据pvkey 获取 uvkey
+                String uvKey = getUvKey(key);
+                uvKeys.add(uvKey);
+                storePVData.setUvNum(cache.counter(uvKey));
+                platformViewDataList.add(storePVData);
+            }
+            batchSave(storePVKeys, storeUvKeys, platformViewDataList);
+        }
+    }
+
+    /**
+     * 根据缓存的PVkey 获取对应的UVkey
+     *
+     * @param key
+     * @return
+     */
+    private String getUvKey(String key) {
+        if (StringUtils.isNotEmpty(key)) {
+
+            key = key.replace(CachePrefix.PV.getPrefix(), CachePrefix.UV.getPrefix());
+            key = key.replace(CachePrefix.STORE_PV.getPrefix(), CachePrefix.STORE_UV.getPrefix());
+            return key;
+        }
+        return key;
+    }
+
+    /**
+     * 批量保存数据&&清除保存数据的缓存
+     *
+     * @param pvKeys           PV key
+     * @param uvKeys           UV key
+     * @param platformViewData DOS
+     */
+    @Transactional(rollbackFor = Exception.class)
+    void batchSave(List<String> pvKeys, List<String> uvKeys, List<PlatformViewData> platformViewData) {
+        log.debug("批量保存流量数据，共计【{}】条", platformViewData.size());
+        platformViewDataService.saveBatch(platformViewData);
+        //批量删除缓存key
+        cache.multiDel(pvKeys);
+        cache.multiDel(uvKeys);
+        log.debug("流量数据保存完成");
+    }
+
+
+    /**
+     * 过滤缓存key
+     *
+     * @param keys 缓存key集合
+     */
+    private static List<String> filterKeys(List<String> keys) {
+
+        //只统计一天前的数据
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, -24);
+
+        List<String> result = new ArrayList<>();
+        for (String key : keys) {
+            PageViewStatistics temp = new PageViewStatistics(key);
+            //如果需要统计，则将key写入集合
+            if (temp.getDate().before(calendar.getTime())) {
+                result.add(key);
+            }
+        }
+
+        return result;
+    }
+
+}
+
+/**
+ * 根据缓存key 获取其中需要的参数，年月日，以及店铺信息
+ */
+@Data
+class PageViewStatistics {
+    /**
+     * 年 、 月 、 日 、 店铺id
+     */
+    private Date date;
+    private String storeId;
+
+    public PageViewStatistics(String str) {
+        //将字符串解析成需要的对象
+        str = str.substring(str.indexOf("}") + 2);
+        String[] dateStr = str.split("-");
+        Integer year = Integer.parseInt(dateStr[0]);
+        Integer month = Integer.parseInt(dateStr[1]);
+        Integer day;
+        //是否有店铺id
+        if (dateStr.length > 3) {
+            day = Integer.parseInt(dateStr[2]);
+            this.storeId = dateStr[3];
+        } else {
+            day = Integer.parseInt(dateStr[2]);
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month - 1);
+        calendar.set(Calendar.DAY_OF_MONTH, day);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        this.date = calendar.getTime();
+        System.out.println(DateUtil.toString(date,DateUtil.STANDARD_FORMAT));
+    }
+
+}