From c2298b7feb6c8d968cac3da3e9d3caa56853f648 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 五月 2023 15:14:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java |   92 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
index cff3c39..ae9138f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderService.java
@@ -7,6 +7,9 @@
 import com.baomidou.mybatisplus.service.IService;
 import org.springframework.ui.Model;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,7 +55,7 @@
      * @param agentId
      * @param model
      */
-    void getDataStatisticsByYear(Integer agentId,String yearDate, Model model);
+    void getDataStatisticsByYear(Integer agentId,String yearDate, Model model,Map<String, Object> map);
 
     /**
      * 单量
@@ -60,14 +63,14 @@
      * @param monthDate
      * @param model
      */
-    void getDataStatisticsOrderCount(Integer agentId, String monthDate, Model model);
+    void getDataStatisticsOrderCount(Integer agentId, String monthDate, Model model,Map<String, Object> map);
 
     /**
      * 查询统计待接单，服务中，已完成，已取消
      * @param agentId
-     * @param map
+     * @param model
      */
-    void getDataStatisticsCount(Integer agentId, Map<String, Integer> map);
+    void getDataStatisticsCount(Integer agentId, Model model);
 
     /**
      * 查询服务中的订单列表
@@ -81,6 +84,85 @@
      * @param agentId
      * @return
      */
-    List<TOrder> getDataStatisticsAllList(Integer agentId);
+    List<TOrder> getDataStatisticsAllList(Integer agentId,Integer type);
 
+    /**
+     * 查询统计在线司机，待接单，服务中，已完成，已取消
+     * @param ids
+     * @param model
+     */
+    void getDataStatisticsCountByIds(List<Integer> ids, Model model);
+
+    /**
+     * 查询服务中的订单列表
+     * @param ids
+     * @return
+     */
+    List<TOrderServerResp> getDataStatisticsServerListByIds(List<Integer> ids);
+
+    /**
+     * 查询今天所有订单
+     * @param ids
+     * @return
+     */
+    List<TOrder> getDataStatisticsAllListByIds(List<Integer> ids,Integer type);
+
+    /**
+     * 查询统计在线司机
+     * @param agentId
+     * @param map
+     */
+    void getDataStatisticsCountGetMap(Integer agentId, HashMap<String, Object> map);
+
+    /**
+     * 查询统计在线司机(广东)
+     * @param ids
+     * @param map
+     */
+    void getDataStatisticsCountByIdsGetMap(List<Integer> ids, HashMap<String, Object> map);
+
+    /**
+     * 订单统计，每年按月份
+     * @param ids
+     * @param yearDate
+     * @param model
+     * @param map
+     */
+    void getDataStatisticsByYearByIds(List<Integer> ids, String yearDate, Model model, Map<String, Object> map);
+
+    /**
+     * 业绩排名单量（广东）
+     * @param ids
+     * @param monthDate
+     * @param model
+     * @param map
+     */
+    void getDataStatisticsOrderCountByIds(List<Integer> ids, String monthDate, Model model, Map<String, Object> map);
+
+    /**
+     * 订单统计 本月
+     * @param agentId
+     * @param dayDate
+     * @param model
+     * @param map
+     */
+    void getStatisticsOrderByMonth(Integer agentId, String dayDate, Model model, Map<String, Object> map);
+
+    /**
+     * 查询本月广东
+     * @param ids
+     * @param dayDate
+     * @param model
+     * @param map
+     */
+    void getStatisticsOrderByMonthIds(List<Integer> ids, String dayDate, Model model, Map<String, Object> map);
+
+    /**
+     * 查询司机当月有效订单数量
+     * @param driverId
+     * @param orderMoney
+     * @param month
+     * @return
+     */
+    Integer getValidOrderCount(Integer driverId, BigDecimal orderMoney, String month);
 }

--
Gitblit v1.7.1