数据统计

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

@@ -24,12 +24,12 @@ public class DataSummaryTradeParam implements Serializable {
      * 开始时间 格式：yyyy-MM-dd
      */
     @NotBlank(message = "开始日期不能为空", groups = DefaultGroup.class)
-    private String beginTime;
+    private String beginDate;
     /**
      * 结束时间 格式：yyyy-MM-dd
      */
     @NotBlank(message = "结束日期不能为空", groups = DefaultGroup.class)
-    private String endTime;
+    private String endDate;
     /**
      * 店铺id
      */

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

@@ -21,11 +21,11 @@ public class TableSummaryParam implements Serializable {
     /**
      * 开始时间 格式：yyyy-MM-dd
      */
-    private String beginTime;
+    private String beginDate;
     /**
      * 结束时间 格式：yyyy-MM-dd
      */
-    private String endTime;
+    private String endDate;
     /**
      * 店铺id
      */

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

@@ -1,7 +1,6 @@
 package com.czg.order.service;
 
 import com.czg.order.param.TableSummaryParam;
-import com.czg.order.vo.TableSummaryExportVo;
 import com.czg.order.vo.TableSummaryInfoVo;
 
 import java.util.List;
@@ -15,7 +14,6 @@ import java.util.List;
 public interface TableSummaryService {
 
     List<TableSummaryInfoVo> summaryList(TableSummaryParam param);
-    List<TableSummaryExportVo> summaryExport(TableSummaryParam param);
 
 
 }

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

@@ -1,5 +1,10 @@
 package com.czg.order.vo;
 
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.pig4cloud.plugin.excel.annotation.ExcelLine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,61 +19,47 @@ import java.math.BigDecimal;
  */
 @NoArgsConstructor
 @Data
+@ColumnWidth(30)
 public class TableSummaryInfoVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-     * 台桌
+     * 导入时候回显行号
      */
+    @ExcelLine
+    @ExcelIgnore
+    @JSONField(serialize = false)
+    private Long lineNum;
+    /**
+     * 区域名称
+     */
+    @ExcelProperty("区域名称")
+    private String areaName;
+    /**
+     * 台桌号
+     */
+    @ExcelProperty("台桌号")
     private String tableName;
     /**
-     * 日期
+     * 订单数量
      */
-    private String date;
+    @ExcelProperty("订单数量")
+    private Long orderCount;
     /**
-     * 商品分类
+     * 订单金额
      */
-    private String categoryName;
+    @ExcelProperty("订单金额")
+    private BigDecimal orderAmount;
     /**
-     * 商品名称
+     * 退款数量
      */
-    private String productName;
+    @ExcelProperty("退款数量")
+    private Long refundCount;
     /**
-     * 单位
-     */
-    private String unitName;
-    /**
-     * 商品规格
-     */
-    private String specName;
-    /**
-     * 销量
-     */
-    private BigDecimal salesNum;
-    /**
-     * 单价
-     */
-    private BigDecimal price;
-    /**
-     * 金额
-     */
-    private BigDecimal amount;
-    /**
-     * 销售额
-     */
-    private BigDecimal salesAmount;
-    /**
-     * 总销售额
-     */
-    private BigDecimal totalSalesAmount;
-    /**
-     * 退单量
-     */
-    private Integer refundNum;
-    /**
-     * 退单额
+     * 退款金额
      */
+    @ExcelProperty("退款金额")
     private BigDecimal refundAmount;
 }