From 70b7d38bad67efb363d0da7304b37d1788743aa4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 11 Nov 2025 15:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=AB=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DataSummaryController.java | 6 +- .../order/entity/ShopTableOrderStatistic.java | 91 ++++++++++++++++++- .../impl/ShopOrderStatisticServiceImpl.java | 5 +- .../impl/ShopProdStatisticServiceImpl.java | 5 +- .../ShopTableOrderStatisticServiceImpl.java | 6 +- 5 files changed, 105 insertions(+), 8 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 6f4bdb29..fb9c2148 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,7 @@ public class DataSummaryController { @SaAdminCheckPermission(value = "dataSummary:trade", name = "营业板块-上半部分") public CzgResult getTradeData(DataSummaryTradeParam param) { ValidatorUtil.validateEntity(param, DefaultGroup.class); - Long shopId = StpKit.USER.getShopId(0L); + Long shopId = StpKit.USER.getShopId(); if (param.getShopId() == null) { param.setShopId(shopId); } @@ -61,7 +61,7 @@ public class DataSummaryController { @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下") public CzgResult> getProductSaleData(DataSummaryProductSaleParam param) { ValidatorUtil.validateEntity(param, DefaultGroup.class); - Long shopId = StpKit.USER.getShopId(0L); + Long shopId = StpKit.USER.getShopId(); if (param.getShopId() == null) { param.setShopId(shopId); } @@ -82,7 +82,7 @@ public class DataSummaryController { public CzgResult getDateAmount(@RequestParam Integer day, @RequestParam(required = false) Long shopId) { AssertUtil.isNull(day, "天数不能为空"); if (shopId == null) { - shopId = StpKit.USER.getShopId(0L); + shopId = StpKit.USER.getShopId(); } DataSummaryDateAmountVo data = dataSummaryService.getSummaryAmountData(shopId, day); return CzgResult.success(data); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java index 7eeb9427..af9648f8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java @@ -18,8 +18,6 @@ import java.util.Date; * @author zs * @since 2025-03-07 */ -@Data - @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_table_order_statistic") @@ -74,5 +72,94 @@ public class ShopTableOrderStatistic implements Serializable { * 退款金额 */ private BigDecimal refundAmount; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTableId() { + return tableId; + } + + public void setTableId(Long tableId) { + this.tableId = tableId; + } + + public String getTableCode() { + return tableCode; + } + + public void setTableCode(String tableCode) { + this.tableCode = tableCode; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public Long getOrderCount() { + return orderCount; + } + + public void setOrderCount(Long orderCount) { + this.orderCount = orderCount; + } + + public BigDecimal getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(BigDecimal orderAmount) { + this.orderAmount = orderAmount; + } + + public Long getShopId() { + return shopId; + } + + public void setShopId(Long shopId) { + this.shopId = shopId; + } + + public Date getCreateDay() { + return createDay; + } + + public void setCreateDay(Date createDay) { + this.createDay = createDay; + } + + public Long getRefundCount() { + return refundCount; + } + + public void setRefundCount(Long refundCount) { + this.refundCount = refundCount; + } + + public BigDecimal getRefundAmount() { + return refundAmount; + } + + public void setRefundAmount(BigDecimal refundAmount) { + this.refundAmount = refundAmount; + } } 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 93688ed4..959092d6 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 @@ -61,7 +61,10 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl list = shopProdStatisticMapper.findProdRandingSummaryPage2(param); for (DataSummaryProductSaleRankingVo dto : list) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopTableOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopTableOrderStatisticServiceImpl.java index 1eb8f8c3..dec24bc1 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopTableOrderStatisticServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopTableOrderStatisticServiceImpl.java @@ -86,7 +86,11 @@ public class ShopTableOrderStatisticServiceImpl extends ServiceImpl list = shopTableOrderStatisticMapper.findSummaryList2(param); for (TableSummaryInfoVo dto : list) {