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-12-09 11:41:45 +08:00
parent b2abaed3c8
commit 1e8c1e03e9
3 changed files with 9 additions and 12 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

@@ -53,9 +53,8 @@ public class DataSummaryController {
if (hasKey) { if (hasKey) {
return CzgResult.failure("数据统计任务正在运行中，请稍后再试"); return CzgResult.failure("数据统计任务正在运行中，请稍后再试");
} }
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(StpKit.USER.getShopId());
} }
ShopOrderStatistic data = orderStatisticService.getArchiveTradeData(param.getShopId(), param.getRangeType(), param.getBeginDate(), param.getEndDate()); ShopOrderStatistic data = orderStatisticService.getArchiveTradeData(param.getShopId(), param.getRangeType(), param.getBeginDate(), param.getEndDate());
return CzgResult.success(data); return CzgResult.success(data);
@@ -66,8 +65,10 @@ public class DataSummaryController {
*/ */
@GetMapping("productSaleDate") @GetMapping("productSaleDate")
@SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下") @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day) { public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day,@RequestParam(required = false) Long shopId) {
Long shopId = StpKit.USER.getShopId(); if (shopId == null) {
shopId = StpKit.USER.getShopId();
}
List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy10(shopId,day); List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy10(shopId,day);
return CzgResult.success(data); return CzgResult.success(data);
} }

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

@@ -38,9 +38,8 @@ public class SaleSummaryController {
@OperationLog("统计") @OperationLog("统计")
//@SaAdminCheckPermission("saleSummary:count") //@SaAdminCheckPermission("saleSummary:count")
public CzgResult<SaleSummaryCountVo> summaryCount(SaleSummaryCountParam param) { public CzgResult<SaleSummaryCountVo> summaryCount(SaleSummaryCountParam param) {
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(StpKit.USER.getShopId());
} }
SaleSummaryCountVo data = prodStatisticService.summaryCount(param); SaleSummaryCountVo data = prodStatisticService.summaryCount(param);
return CzgResult.success(data); return CzgResult.success(data);
@@ -53,9 +52,8 @@ public class SaleSummaryController {
@OperationLog("分页") @OperationLog("分页")
//@SaAdminCheckPermission("saleSummary:page") //@SaAdminCheckPermission("saleSummary:page")
public CzgResult<List<ShopProdStatistic>> summaryPage(SaleSummaryCountParam param) { public CzgResult<List<ShopProdStatistic>> summaryPage(SaleSummaryCountParam param) {
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(StpKit.USER.getShopId());
} }
List<ShopProdStatistic> list = prodStatisticService.getArchiveTradeData(param); List<ShopProdStatistic> list = prodStatisticService.getArchiveTradeData(param);
return CzgResult.success(list); return CzgResult.success(list);
@@ -64,9 +62,8 @@ public class SaleSummaryController {
@ResponseExcel(name = "销售统计明细") @ResponseExcel(name = "销售统计明细")
@GetMapping("/export") @GetMapping("/export")
public List<ShopProdStatistic> summaryExport(SaleSummaryCountParam param) { public List<ShopProdStatistic> summaryExport(SaleSummaryCountParam param) {
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(StpKit.USER.getShopId());
} }
return prodStatisticService.getArchiveTradeData(param); return prodStatisticService.getArchiveTradeData(param);
} }

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

@@ -59,9 +59,8 @@ public class TableSummaryController {
@OperationLog("导出") @OperationLog("导出")
//@SaAdminCheckPermission("tableSummary:export") //@SaAdminCheckPermission("tableSummary:export")
public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) { public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) {
Long shopId = StpKit.USER.getShopId();
if (param.getShopId() == null) { if (param.getShopId() == null) {
param.setShopId(shopId); param.setShopId(StpKit.USER.getShopId());
} }
return tableSummaryService.summaryExportList(param); return tableSummaryService.summaryExportList(param);
} }