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 f837dbef1..f71a7603f 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 @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/admin/data/summary") public class DataSummaryController { + private final DataSummaryService dataSummaryService; /** @@ -47,7 +48,7 @@ public class DataSummaryController { @GetMapping("productSaleDate") @OperationLog("商品销售-右下") //@SaAdminCheckPermission("dataSummary:productSaleData") - private CzgResult getProductSaleData(DataSummaryProductSaleParam param) { + public CzgResult getProductSaleData(DataSummaryProductSaleParam param) { Long shopId = StpKit.USER.getShopId(0L); param.setShopId(shopId); DataSummaryProductSaleVo data = dataSummaryService.getProductSaleData(param); @@ -62,7 +63,7 @@ public class DataSummaryController { @GetMapping("dateAmount") @OperationLog("销售趋势柱状图 左下") //@SaAdminCheckPermission("dataSummary:dateAmount") - private CzgResult getDateAmount(@RequestParam Integer day) { + public CzgResult getDateAmount(@RequestParam Integer day) { Long shopId = StpKit.USER.getShopId(0L); DataSummaryDateAmountVo data = dataSummaryService.getSummaryAmountData(shopId, day); return CzgResult.success(data); @@ -75,7 +76,7 @@ public class DataSummaryController { */ @GetMapping("datePayType") //@SaAdminCheckPermission("dataSummary:datePayType") - private Object shopSummaryPayType(@RequestParam Integer day) { + public CzgResult shopSummaryPayType(@RequestParam Integer day) { Long shopId = StpKit.USER.getShopId(0L); DataSummaryPayTypeVo data = dataSummaryService.getSummaryPayTypeData(shopId, day); return CzgResult.success(data); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryDateAmountVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryDateAmountVo.java index f4dd908a4..35ed28af0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryDateAmountVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryDateAmountVo.java @@ -5,6 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -22,7 +23,7 @@ public class DataSummaryDateAmountVo implements Serializable { /** * total */ - private List total; + private List total = new ArrayList<>(); /** * TotalVo diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryPayTypeVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryPayTypeVo.java index 78a010bd8..3298da9ab 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryPayTypeVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryPayTypeVo.java @@ -5,6 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -23,7 +24,7 @@ public class DataSummaryPayTypeVo implements Serializable { /** * countPayType */ - private List countPayType; + private List countPayType = new ArrayList<>(); /** * CountPayTypeVo diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryProductSaleVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryProductSaleVo.java index 711cae5e5..cf70c6754 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryProductSaleVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryProductSaleVo.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -25,19 +26,19 @@ public class DataSummaryProductSaleVo implements Serializable { /** * productSum */ - private ProductSumVo productSum; + private ProductSumVo productSum = new ProductSumVo(); /** * countList */ - private List countList; + private List countList = new ArrayList<>(); /** * productCount */ - private ProductCountVo productCount; + private ProductCountVo productCount = new ProductCountVo(); /** * productList */ - private Page productList; + private Page productList = new Page(new ArrayList(), 1, 10, 0); /** * ProductSumVo @@ -64,7 +65,7 @@ public class DataSummaryProductSaleVo implements Serializable { /** * saveAmount */ - private Object saveAmount; + private BigDecimal saveAmount; } /** @@ -92,7 +93,7 @@ public class DataSummaryProductSaleVo implements Serializable { /** * saveAmount */ - private Object saveAmount; + private BigDecimal saveAmount; } /** * ContentVo @@ -123,11 +124,11 @@ public class DataSummaryProductSaleVo implements Serializable { /** * productSkuId */ - private Object productSkuId; + private Long productSkuId; /** * productSkuName */ - private Object productSkuName; + private String productSkuName; /** * refAmount */ @@ -140,11 +141,6 @@ public class DataSummaryProductSaleVo implements Serializable { * salesAmount */ private BigDecimal salesAmount; - - - - - /** * 销售数量 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryTradeVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryTradeVo.java index 862f4bad8..c1e52c565 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryTradeVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/DataSummaryTradeVo.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -23,15 +24,15 @@ public class DataSummaryTradeVo implements Serializable { /** * sale */ - private SaleVo sale; + private SaleVo sale = new SaleVo(); /** * count */ - private CountVo count; + private CountVo count = new CountVo(); /** * vip */ - private VipVo vip; + private VipVo vip = new VipVo(); /** * SaleVo @@ -66,7 +67,7 @@ public class DataSummaryTradeVo implements Serializable { /** * payCount */ - private List payCount; + private List payCount = new ArrayList<>(); /** * 销售退款金额 */ @@ -97,7 +98,7 @@ public class DataSummaryTradeVo implements Serializable { /** * saveAmount */ - private Object saveAmount; + private BigDecimal saveAmount; } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java index 8e7e1727d..d6f6cc927 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java @@ -5,6 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; /** * 销量统计汇总 @@ -37,5 +38,5 @@ public class SaleSummaryCountVo implements Serializable { /** * saveAmount */ - private Object saveAmount; + private BigDecimal saveAmount; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java index 079838aed..24f3c395d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java @@ -5,7 +5,6 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.List; /** * 销量统计明细 @@ -48,56 +47,8 @@ public class SaleSummaryInfoVo implements Serializable { * salesNum */ private Integer salesNum; - /** - * skus - */ - private List skus; /** * typeEnum */ private String typeEnum; - - /** - * SkusVo - */ - @NoArgsConstructor - @Data - public static class SkusVo { - /** - * cateName - */ - private String cateName; - /** - * name - */ - private String name; - /** - * productId - */ - private Integer productId; - /** - * refAmount - */ - private Integer refAmount; - /** - * refNum - */ - private Integer refNum; - /** - * salesAmount - */ - private Integer salesAmount; - /** - * salesNum - */ - private Integer salesNum; - /** - * skus - */ - private List skus; - /** - * typeEnum - */ - private String typeEnum; - } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java index dddfc2f4d..2eff48539 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java @@ -19,9 +19,6 @@ public class TableSummaryInfoVo implements Serializable { @Serial private static final long serialVersionUID = 1L; -// 台桌 日期 商品分类 商品名称 单位 商品规格 销量 单价 金额 销售额 总销售额 退单量 退单额 - - /** * 台桌 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java index cb8e2e79d..7eb8201e3 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java @@ -23,7 +23,9 @@ public class DataSummaryServiceImpl implements DataSummaryService { @Override public DataSummaryProductSaleVo getProductSaleData(DataSummaryProductSaleParam param) { - return new DataSummaryProductSaleVo(); + DataSummaryProductSaleVo data = new DataSummaryProductSaleVo(); + System.out.println(1); + return data; } @Override