czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日期范围

Browse Source
This commit is contained in:
wangw
2025-11-24 14:04:31 +08:00
parent 87d6399e35
commit 57d4c8f794
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java
View File

@@ -13,8 +13,6 @@ import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.RedisService;
import com.czg.utils.AssertUtil;
import com.czg.validator.ValidatorUtil;
import com.czg.validator.group.DefaultGroup;
import jakarta.annotation.Resource;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -69,12 +67,9 @@ public class DataSummaryController {
@GetMapping("productSaleDate")
@OperationLog("商品销售-右下")
@SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
public CzgResult<List<ShopProdStatistic>> getProductSaleData(@Validated DataSummaryTradeParam param) {
public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day) {
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) {
param.setShopId(shopId);
}
List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy20(param.getShopId(), param.getRangeType(), param.getBeginDate(), param.getEndDate());
List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy20(shopId,day);
return CzgResult.success(data);
}

5
cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopProdStatisticService.java
View File

@@ -18,7 +18,6 @@ public interface ShopProdStatisticService extends IService<ShopProdStatistic> {
/**
* 统计一段时间内的商品交易数据
*
* @param param 入参
* @return 商品数据
*/
SaleSummaryCountVo summaryCount(Long shopId, String productName, String rangeType, LocalDate start, LocalDate end);
@@ -40,14 +39,12 @@ public interface ShopProdStatisticService extends IService<ShopProdStatistic> {
* @return 商品数据
*/
List<ShopProdStatistic> getArchiveTradeData(Long shopId, String productName, String rangeType, LocalDate start, LocalDate end);
List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, String rangeType, LocalDate start, LocalDate end);
List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, Integer day);
//------------------------------------------------------------下列为 后台使用------------------------------------------------------------
/**
* 统计某天数据并插入数据库
*
* @param day
*/
void statisticAndInsert(Long shopId, LocalDate day);

8
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
View File

@@ -31,8 +31,10 @@ import java.util.stream.Stream;
public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticMapper, ShopProdStatistic> implements ShopProdStatisticService {
@Override
public List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, String rangeType, LocalDate start, LocalDate end) {
List<ShopProdStatistic> archiveTradeData = getArchiveTradeData(shopId, null, rangeType, start, end);
public List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, Integer day) {
LocalDate currentDate = LocalDate.now();
LocalDate startDate = currentDate.minusDays(day - 1);
List<ShopProdStatistic> archiveTradeData = getArchiveTradeData(shopId, null, "", startDate, currentDate);
// 按照 saleCount 降序排序
return archiveTradeData.stream()
.sorted(
@@ -110,7 +112,7 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
realTimeData = realTimeData.stream()
.filter(ShopProdStatistic::isValid)
.toList();
if(CollUtil.isNotEmpty(realTimeData)) {
if (CollUtil.isNotEmpty(realTimeData)) {
boolean exists = exists(QueryWrapper.create().eq(ShopProdStatistic::getShopId, shopId).eq(ShopProdStatistic::getCreateDay, day));
if (exists) {
remove(QueryWrapper.create().eq(ShopProdStatistic::getShopId, shopId).eq(ShopProdStatistic::getCreateDay, day));