From 5c067566781b1f8ee0b26627e4a5064a84e123e9 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Wed, 9 Apr 2025 16:24:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DataSummaryController.java | 24 +++++++++++++------ .../admin/SaleSummaryController.java | 12 +++++++--- .../admin/TableSummaryController.java | 8 +++++-- .../param/DataSummaryProductSaleParam.java | 1 - .../order/param/DataSummaryTradeParam.java | 2 -- .../order/param/SaleSummaryCountParam.java | 2 -- .../czg/order/param/TableSummaryParam.java | 2 -- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java index 7b759b8a..52eee05b 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java @@ -44,7 +44,9 @@ public class DataSummaryController { public CzgResult getTradeData(DataSummaryTradeParam param) { ValidatorUtil.validateEntity(param, DefaultGroup.class); Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } ShopOrderStatistic data = dataSummaryService.getTradeData(param); return CzgResult.success(data); } @@ -59,7 +61,9 @@ public class DataSummaryController { public CzgResult> getProductSaleData(DataSummaryProductSaleParam param) { ValidatorUtil.validateEntity(param, DefaultGroup.class); Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } Page data = dataSummaryService.getProductSaleRankingPage(param); return CzgResult.success(data); } @@ -67,15 +71,18 @@ public class DataSummaryController { /** * 销售趋势柱状图 左下 * - * @param day 天数 + * @param day 天数 + * @param shopId 店铺id */ @GetMapping("dateAmount") @OperationLog("销售趋势柱状图 左下") @SaStaffCheckPermission("yun_xu_cha_kan_jing_ying_shu_ju") //@SaAdminCheckPermission("dataSummary:dateAmount") - public CzgResult getDateAmount(@RequestParam Integer day) { + public CzgResult getDateAmount(@RequestParam Integer day, @RequestParam Long shopId) { AssertUtil.isNull(day, "天数不能为空"); - Long shopId = StpKit.USER.getShopId(0L); + if (shopId == null) { + shopId = StpKit.USER.getShopId(0L); + } DataSummaryDateAmountVo data = dataSummaryService.getSummaryAmountData(shopId, day); return CzgResult.success(data); } @@ -84,13 +91,16 @@ public class DataSummaryController { * 支付占比饼图 左下 * * @param day 天数 + * @param shopId 店铺id */ @GetMapping("datePayType") @OperationLog("支付占比饼图 左下") @SaStaffCheckPermission("yun_xu_cha_kan_jing_ying_shu_ju") //@SaAdminCheckPermission("dataSummary:datePayType") - public CzgResult shopSummaryPayType(@RequestParam Integer day) { - Long shopId = StpKit.USER.getShopId(0L); + public CzgResult shopSummaryPayType(@RequestParam Integer day, @RequestParam Long shopId) { + if (shopId == null) { + shopId = StpKit.USER.getShopId(0L); + } DataSummaryPayTypeVo data = dataSummaryService.getSummaryPayTypeData(shopId, day); return CzgResult.success(data); } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java index 15fe88af..b08584fc 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java @@ -38,7 +38,9 @@ public class SaleSummaryController { //@SaAdminCheckPermission("saleSummary:count") public CzgResult summaryCount(SaleSummaryCountParam param) { Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } SaleSummaryCountVo data = saleSummaryService.summaryCount(param); return CzgResult.success(data); } @@ -51,7 +53,9 @@ public class SaleSummaryController { //@SaAdminCheckPermission("saleSummary:page") public CzgResult> summaryPage(SaleSummaryCountParam param) { Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } Page page = saleSummaryService.summaryPage(param); return CzgResult.success(page); } @@ -65,7 +69,9 @@ public class SaleSummaryController { //@SaAdminCheckPermission("saleSummary:export") public List summaryExport(SaleSummaryCountParam param) { Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } return saleSummaryService.summaryList(param); } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java index cfb0c782..0fbc0309 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java @@ -37,7 +37,9 @@ public class TableSummaryController { //@SaAdminCheckPermission("tableSummary:list") public CzgResult> summaryList(TableSummaryParam param) { Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } List data = tableSummaryService.summaryList(param); return CzgResult.success(data); } @@ -51,7 +53,9 @@ public class TableSummaryController { //@SaAdminCheckPermission("tableSummary:export") public List summaryExport(TableSummaryParam param) { Long shopId = StpKit.USER.getShopId(0L); - param.setShopId(shopId); + if (param.getShopId() == null) { + param.setShopId(shopId); + } return tableSummaryService.summaryExportList(param); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryProductSaleParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryProductSaleParam.java index 2b8a185a..a7ae4cb2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryProductSaleParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryProductSaleParam.java @@ -34,7 +34,6 @@ public class DataSummaryProductSaleParam implements Serializable { /** * 店铺id */ - @JSONField(serialize = false) private Long shopId; /** * 开始日期 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java index 3b71ed0f..a9099adf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java @@ -1,6 +1,5 @@ package com.czg.order.param; -import com.alibaba.fastjson2.annotation.JSONField; import com.czg.validator.group.DefaultGroup; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -33,7 +32,6 @@ public class DataSummaryTradeParam implements Serializable { /** * 店铺id */ - @JSONField(serialize = false) private Long shopId; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java index f64ae7f8..67168054 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java @@ -1,6 +1,5 @@ package com.czg.order.param; -import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.io.Serial; @@ -20,7 +19,6 @@ public class SaleSummaryCountParam implements Serializable { /** * 店铺id */ - @JSONField(serialize = false) private Long shopId; /** * 商品名称 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java index 54c618db..fedbe420 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java @@ -1,6 +1,5 @@ package com.czg.order.param; -import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.io.Serial; @@ -29,7 +28,6 @@ public class TableSummaryParam implements Serializable { /** * 店铺id */ - @JSONField(serialize = false) private Long shopId; }