From 508f3e225df87e0da974424981e7782fc5ce875c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:21:39 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java
index 45e9fdb..fc09cf0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java
@@ -3,11 +3,10 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.domain.TOrderSale;
+import com.ruoyi.system.dto.CheckoutDTO;
 import com.ruoyi.system.dto.TOrderSaleDTO;
-import com.ruoyi.system.query.TDataGeneratorSaleQuery;
-import com.ruoyi.system.query.TDataStatisticsQuery;
-import com.ruoyi.system.query.TOrderMealQuery;
-import com.ruoyi.system.query.TOrderSaleQuery;
+import com.ruoyi.system.export.SumGeneratorClient;
+import com.ruoyi.system.query.*;
 import com.ruoyi.system.vo.*;
 
 import java.math.BigDecimal;
@@ -42,7 +41,7 @@
      * @param query
      * @return
      */
-    AmountSumVO amountSum(TOrderMealQuery query);
+    AmountSumVO amountSum(TOrderSaleQuery query);
 
     /**
      * 查询销售销售量统计
@@ -56,7 +55,7 @@
      * @param query
      * @return
      */
-    List<SalesRankingVO> salesRanking(TDataStatisticsQuery query);
+    PageInfo<SalesRankingVO> salesRanking(TDataStatisticsQuery query);
 
     /**
      * 导出销售列表
@@ -77,7 +76,7 @@
      * @param query
      * @return
      */
-    Map<String, BigDecimal> getDataGeneratorMealDetail(TDataGeneratorSaleQuery query);
+    Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query);
 
     /**
      * 销售生成数据详情导出
@@ -85,4 +84,46 @@
      * @return
      */
     List<TOrderSaleVO> saleGeneratorExport(TDataGeneratorSaleQuery query);
+
+    /**
+     * 结账接口
+     * @param dto
+     */
+    void checkout(CheckoutDTO dto);
+
+    /**
+     * 修改订单
+     * @param dto
+     */
+    void edit(TOrderSaleDTO dto);
+
+    /**
+     * 销售数据生成列表导出
+     * @param query
+     * @return
+     */
+    List<TDataGeneratorVO> saleGeneratorListExport(TDataGeneratorQuery query);
+
+    /**
+     * 盈利明细详情
+     * @param query
+     * @return
+     */
+    ProfitDetailsVO profitDetails(ProfitDetailsQuery query);
+
+    /**
+     * 明细导出
+     * @param query
+     * @return
+     */
+    List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query);
+
+    /**
+     * 删除销售数据
+     * @param shopId
+     */
+    void deleteByShopId(Long shopId);
+
+    Map<String, Double> getDataGeneratorSaleDetailOrderMoney(TDataGeneratorSaleQuery query);
+
 }

--
Gitblit v1.7.1