diff --git a/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java b/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java index 9850e2fb..a4405a9a 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java @@ -21,6 +21,7 @@ public class StatisticTask { @Resource private ShopOrderStatisticService shopOrderStatisticService; +// @Scheduled(cron = "1/6 * * * * ? ") @Scheduled(cron = "0 0 9 * * ?") public void run() { long start = System.currentTimeMillis(); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java index 278a9819..ef79ef2f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java @@ -1,6 +1,7 @@ package com.czg.order.entity; import com.alibaba.fastjson2.annotation.JSONField; +import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; @@ -136,6 +137,7 @@ public class ShopOrderStatistic implements Serializable { /** * 新增会员数 */ + @Column(ignore = true) private Long newMemberCount = 0L; /** * 店铺id diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java index 2753dc76..ada65269 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java @@ -60,8 +60,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl flowMap = shopUserFlowService.list(new QueryWrapper() - .ge(ShopUserFlow::getCreateTime, startOfDay) - .le(ShopUserFlow::getCreateTime, endOfDay) + .ge(ShopUserFlow::getCreateTime, startOfDay.toLocalDateTime()) + .le(ShopUserFlow::getCreateTime, endOfDay.toLocalDateTime()) .in(ShopUserFlow::getBizCode, CollUtil.newArrayList("cashIn", "wechatIn", "alipayIn", "awardIn"))).stream() .collect(Collectors.groupingBy( ShopUserFlow::getShopId, @@ -138,13 +138,17 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl 0) { + statistic.setTableTurnoverRate(totalCount.subtract(BigDecimal.valueOf(count)).divide(BigDecimal.valueOf(count), 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100))); + } statistic.setUpdateTime(LocalDateTime.now()); BeanUtil.copyProperties(info, statistic); saveOrUpdate(statistic);