数据统计

cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryProductSaleParam.java

@@ -1,10 +1,13 @@
 package com.czg.order.param;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.czg.validator.group.DefaultGroup;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 数据统计-营业-产品销量
@@ -21,7 +24,13 @@ public class DataSummaryProductSaleParam implements Serializable {
     /**
      * 天数
      */
+    @NotNull(message = "天数不能为空", groups = DefaultGroup.class)
     private Integer day;
+    /**
+     * 天数列表
+     */
+    @JSONField(serialize = false)
+    private List<String> days;
     /**
      * 店铺id
      */

cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java

@@ -1,5 +1,6 @@
 package com.czg.order.param;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.io.Serial;
@@ -17,20 +18,24 @@ public class SaleSummaryCountParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * shopId
+     * 店铺id
      */
+    @JSONField(serialize = false)
     private Long shopId;
-    /**
-     * 分类id
-     */
-    private Long cateId;
     /**
      * 商品名称
      */
-    private String proName;
+    private String productName;
     /**
-     * 类型
+     * 商品分类id
      */
-    private Integer type;
-
+    private Long prodCategoryId;
+    /**
+     * 开始日期 格式：yyyy-MM-dd
+     */
+    private String beginDate;
+    /**
+     * 结束日期 格式：yyyy-MM-dd
+     */
+    private String endDate;
 }

cash-common/cash-common-service/src/main/java/com/czg/order/service/DataSummaryService.java

@@ -5,7 +5,8 @@ import com.czg.order.param.DataSummaryProductSaleParam;
 import com.czg.order.param.DataSummaryTradeParam;
 import com.czg.order.vo.DataSummaryDateAmountVo;
 import com.czg.order.vo.DataSummaryPayTypeVo;
-import com.czg.order.vo.DataSummaryProductSaleVo;
+import com.czg.order.vo.DataSummaryProductSaleRankingVo;
+import com.mybatisflex.core.paginate.Page;
 
 /**
  * 数据统计Service接口
@@ -17,7 +18,7 @@ public interface DataSummaryService {
 
     ShopOrderStatistic getTradeData(DataSummaryTradeParam param);
 
-    DataSummaryProductSaleVo getProductSaleData(DataSummaryProductSaleParam param);
+    Page<DataSummaryProductSaleRankingVo> getProductSaleRankingPage(DataSummaryProductSaleParam param);
 
     DataSummaryDateAmountVo getSummaryAmountData(Long shopId,Integer day);
 

cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java

@@ -1,7 +1,6 @@
 package com.czg.order.vo;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,7 +11,6 @@ import java.math.BigDecimal;
  * @author tankaikai
  * @since 2025-03-07 16:22
  */
-@NoArgsConstructor
 @Data
 public class SaleSummaryCountVo implements Serializable {
 
@@ -20,23 +18,19 @@ public class SaleSummaryCountVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * icon
+     * 总金额
      */
-    private String icon;
+    private BigDecimal totalAmount = BigDecimal.ZERO;
     /**
-     * isAmount
+     * 退款金额
      */
-    private String isAmount;
+    private BigDecimal refundAmount = BigDecimal.ZERO;
     /**
-     * payAmount
+     * 总数量
      */
-    private Double payAmount;
+    private BigDecimal saleCount = BigDecimal.ZERO;
     /**
-     * payType
+     * 退单量
      */
-    private String payType;
-    /**
-     * saveAmount
-     */
-    private BigDecimal saveAmount;
+    private Integer refundCount = 0;
 }