From 2a498d9f65f873cedb74ab5bcb48ad4b845d0622 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 10:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
index 13c22e2..c8d56b5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderMapper.java
@@ -9,7 +9,9 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,11 +57,110 @@
      */
     List<PerformanceTableResp> getDataStatisticsOrderCount(@Param("agentId")Integer agentId, @Param("monthDate")String monthDate);
 
+    /**
+     * 今日非服务中统计
+     * @param agentId
+     * @param type
+     * @param localDate
+     * @return
+     */
     Integer getDataStatisticsCount(@Param("agentId")Integer agentId, @Param("type")Integer type, @Param("localDate")LocalDate localDate);
 
+    /**
+     * 今日服务中统计
+     * @param agentId
+     * @param localDate
+     * @return
+     */
     Integer getDataStatisticsServerCount(@Param("agentId")Integer agentId, @Param("localDate") LocalDate localDate);
 
+    /**
+     * 查询今日服务中的订单列表
+     * @param agentId
+     * @param localDate
+     * @return
+     */
     List<TOrderServerResp> getDataStatisticsServerList(@Param("agentId")Integer agentId,@Param("localDate") LocalDate localDate);
 
-    List<TOrder> getDataStatisticsAllList(@Param("agentId")Integer agentId,@Param("localDate") LocalDate localDate);
+    /**
+     * 查询今日所有列表
+     * @param agentId
+     * @param localDate
+     * @return
+     */
+    List<TOrder> getDataStatisticsAllList(@Param("agentId")Integer agentId,@Param("type") Integer type,@Param("localDate") LocalDate localDate);
+
+    /**
+     * 广东省今日所有区域非服务中查询
+     * @param ids
+     * @param type
+     * @param localDate
+     * @return
+     */
+    Integer getDataStatisticsCountByIds(@Param("ids")List<Integer> ids, @Param("type")Integer type, @Param("localDate")LocalDate localDate);
+
+    /**
+     * 广东省今日服务中查询
+     * @param ids
+     * @param localDate
+     * @return
+     */
+    Integer getDataStatisticsServerCountByIds(@Param("ids")List<Integer> ids, @Param("localDate")LocalDate localDate);
+
+    /**
+     * 广东省今日服务中列表
+     * @param ids
+     * @param localDate
+     * @return
+     */
+    List<TOrderServerResp> getDataStatisticsServerListByIds(@Param("ids")List<Integer> ids, @Param("localDate")LocalDate localDate);
+
+    /**
+     * 广东省今日所有列表
+     * @param ids
+     * @param localDate
+     * @return
+     */
+    List<TOrder> getDataStatisticsAllListByIds(@Param("ids")List<Integer> ids,@Param("type")Integer type, @Param("localDate")LocalDate localDate);
+
+    /**
+     * 通过年份查询订单数量（广东）
+     * @param ids
+     * @param yearDate
+     * @return
+     */
+    List<DataStatisticsOrderYearResp> getDataStatisticsByYearByIds(@Param("ids")List<Integer> ids, @Param("yearDate")String yearDate);
+
+    /**
+     * 业绩排名单量（广东）
+     * @param ids
+     * @param monthDate
+     * @return
+     */
+    List<PerformanceTableResp> getDataStatisticsOrderCountByIds(@Param("ids")List<Integer> ids, @Param("monthDate")String monthDate);
+
+    /**
+     * 查询本月订单
+     * @param agentId
+     * @param dayDate
+     * @return
+     */
+    List<DataStatisticsOrderYearResp> getStatisticsOrderByMonth(@Param("agentId")Integer agentId, @Param("dayDate")String dayDate);
+
+    /**
+     * 查询本月订单广东
+     * @param ids
+     * @param dayDate
+     * @return
+     */
+    List<DataStatisticsOrderYearResp> getStatisticsOrderByMonthIds(@Param("ids")List<Integer> ids, @Param("dayDate")String dayDate);
+
+    /**
+     * 查询司机当月有效订单数量
+     * @param driverId
+     * @param orderMoney
+     * @param month
+     * @return
+     */
+    Integer getValidOrderCount(@Param("driverId") Integer driverId,@Param("orderMoney") BigDecimal orderMoney, @Param("month")String month);
 }

--
Gitblit v1.7.1