首页 统计 数据统计(包括弹窗)/销量统计

快捷修改接口 报错问题

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java

@@ -1,6 +1,5 @@
 package cn.ysk.cashier.controller.shop;
 
-import cn.ysk.cashier.annotation.rest.AnonymousPostMapping;
 import cn.ysk.cashier.dto.ShopSummaryDto;
 import cn.ysk.cashier.service.SummaryService;
 import cn.ysk.cashier.vo.TbOrderPayCountVo;
@@ -9,16 +8,15 @@ import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 
 /**
- * @author lyf
+ * 数据报表
+ * @author ww
  */
 @RestController
 @RequiredArgsConstructor

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java

@@ -25,46 +25,32 @@ public class SummaryController {
     private SummaryService summaryService;
 
 
+    //营业板块 上
     @PostMapping("/trade")
     @AnonymousPostMapping
     private Object shopSummaryDate(@RequestBody BaseQueryDto param) {
         return summaryService.trade(param);
     }
 
-
-
-//    @GetMapping
-//    private Object shopSummary(@RequestParam Integer shopId) {
-//        return summaryService.selectSummary(shopId);
-//    }
-
-    @GetMapping("/date")
-    private Object shopSummaryDate(@RequestParam Integer shopId, @RequestParam Integer day) {
-        return summaryService.selectSummaryDate(shopId, day);
-    }
-
-    @GetMapping("/today")
-    private Object shopSummaryDate(@RequestParam Integer shopId) {
-        return summaryService.selectSummaryToday(shopId);
-    }
-
+    //销售趋势柱状图 左下
     @GetMapping("/dateAmount")
     private Object shopSummaryAmount(@RequestParam Integer shopId, @RequestParam Integer day) {
         return summaryService.selectSummaryAmount(shopId, day);
     }
-
-
-    @GetMapping("/dateProduct")
-    private Object shopSummaryProduct(@RequestParam Integer shopId, @RequestParam Integer day,
-                                      @RequestParam Integer page, @RequestParam Integer size) {
-        return summaryService.selectSummaryProduct(shopId, day, page, size);
-    }
-
+    //支付占比饼图 左下
     @GetMapping("/datePayType")
     private Object shopSummaryPayType(@RequestParam Integer shopId, @RequestParam Integer day) {
         return summaryService.selectSummaryPayType(shopId, day);
     }
 
+    //商品销售 右下
+    @GetMapping("/productSaleDate")
+    private Object productSaleDate(
+            @RequestParam Integer shopId, @RequestParam Integer day ,@RequestParam Integer page,@RequestParam Integer size) {
+        return summaryService.productSaleDate(shopId, day, page, size);
+    }
+
+    //台桌统计
     @GetMapping("/table")
     @AnonymousGetMapping
     private Object shopSummaryTable(@RequestParam Integer shopId,
@@ -72,7 +58,7 @@ public class SummaryController {
                                     @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
         return summaryService.selectSummaryTable(shopId, startTime, endTime);
     }
-
+    //台桌统计导出
     @PostMapping("/table/download")
     @AnonymousPostMapping
     private void downloadShopSummaryTable(HttpServletResponse response, @RequestBody ShopTableSaleInfoDto exportRequest) throws IOException {