code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge branch "master"

Browse Source
This commit is contained in:
paulGao
2021-12-11 17:45:25 +08:00
parent d9d19f8cbd 036ad6defb
commit 90e550934d
345 changed files with 3529 additions and 2779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
View File

@@ -1,6 +1,5 @@
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;
@@ -43,7 +42,7 @@ public class CouponExecute implements EveryDayExecute {
this.memberCouponService.update(updateWrapper);
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + EXPIRATION_DAY);
calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - EXPIRATION_DAY);
Date removeTime = calendar.getTime();
//删除过期/已使用的优惠券
LambdaUpdateWrapper<MemberCoupon> deleteWrapper = new LambdaUpdateWrapper<MemberCoupon>()

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

@@ -8,6 +8,7 @@ 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.aftersale.service.AfterSaleService;
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.CommentStatusEnum;
@@ -15,7 +16,6 @@ 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.AfterSaleService;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.system.entity.dos.Setting;

4
consumer/src/main/java/cn/lili/timetask/handler/impl/order/RechargeOrderTaskExecute.java
View File

@@ -4,12 +4,12 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONUtil;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.trade.entity.dos.Recharge;
import cn.lili.modules.order.trade.service.RechargeService;
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.modules.wallet.entity.dos.Recharge;
import cn.lili.modules.wallet.service.RechargeService;
import cn.lili.timetask.handler.EveryMinuteExecute;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;

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

@@ -1,7 +1,7 @@
package cn.lili.timetask.handler.impl.statistics;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import cn.lili.modules.statistics.service.MemberStatisticsDataService;
import cn.lili.modules.statistics.service.MemberStatisticsService;
import cn.lili.timetask.handler.EveryDayExecute;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ public class MemberStatisticsExecute implements EveryDayExecute {
* 会员统计
*/
@Autowired
private MemberStatisticsDataService memberStatisticsDataService;
private MemberStatisticsService memberStatisticsService;
@Override
public void execute() {
@@ -43,30 +43,13 @@ public class MemberStatisticsExecute implements EveryDayExecute {
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.setMemberCount(memberStatisticsService.memberCount(endTime));
memberStatisticsData.setCreateDate(startTime);
memberStatisticsData.setActiveQuantity(memberStatisticsDataService.activeQuantity(startTime));
memberStatisticsData.setNewlyAdded(memberStatisticsDataService.newlyAdded(startTime, endTime));
memberStatisticsDataService.save(memberStatisticsData);
memberStatisticsData.setActiveQuantity(memberStatisticsService.activeQuantity(startTime));
memberStatisticsData.setNewlyAdded(memberStatisticsService.newlyAdded(startTime, endTime));
memberStatisticsService.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);
}
}

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

@@ -5,7 +5,7 @@ import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.utils.BeanUtil;
import cn.lili.modules.statistics.entity.dos.PlatformViewData;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import cn.lili.modules.statistics.service.PlatformViewService;
import cn.lili.timetask.handler.EveryDayExecute;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -37,7 +37,7 @@ public class PageViewStatisticsExecute implements EveryDayExecute {
* 平台PV统计
*/
@Autowired
private PlatformViewDataService platformViewDataService;
private PlatformViewService platformViewService;
@Override
public void execute() {
@@ -123,7 +123,7 @@ public class PageViewStatisticsExecute implements EveryDayExecute {
@Transactional(rollbackFor = Exception.class)
void batchSave(List<String> pvKeys, List<String> uvKeys, List<PlatformViewData> platformViewData) {
log.debug("批量保存流量数据，共计【{}】条", platformViewData.size());
platformViewDataService.saveBatch(platformViewData);
platformViewService.saveBatch(platformViewData);
//批量删除缓存key
cache.multiDel(pvKeys);
cache.multiDel(uvKeys);