From a053811c774ac07340e46561f5d2ab4d892282a0 Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期一, 29 七月 2024 02:38:40 +0800
Subject: [PATCH] 渠道功能完善

---
 src/main/java/com/taoke/autopay/dao/KeyOrderMapper.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/dao/KeyOrderMapper.java b/src/main/java/com/taoke/autopay/dao/KeyOrderMapper.java
index 4261442..83d6b70 100644
--- a/src/main/java/com/taoke/autopay/dao/KeyOrderMapper.java
+++ b/src/main/java/com/taoke/autopay/dao/KeyOrderMapper.java
@@ -5,6 +5,7 @@
 import java.lang.Long;
 import java.util.List;
 
+import com.taoke.autopay.dto.ChannelOrderStatistic;
 import com.taoke.autopay.entity.OrderDistributeCountInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,7 +20,20 @@
 
 	List<KeyOrder> list(@Param("query") DaoQuery query);
 
+	List<KeyOrder> listWithUser(@Param("query") DaoQuery query);
+
+
 	long count(@Param("query") DaoQuery query);
+
+	long countWithUser(@Param("query") DaoQuery query);
+
+	// 缁熻娓犻亾璁㈠崟閲戦涓庢暟閲�
+	List<ChannelOrderStatistic> statisticChannelOrders(@Param("query") DaoQuery query);
+
+	// 缁熻鐢ㄦ埛鏁伴噺
+	long countUser(@Param("query") DaoQuery query);
+
+
 
 	List<OrderDistributeCountInfo> listDistributeUids(@Param("minActiveTime") Date minActiveTime, @Param("minKeyOrderCreateTime") Date minKeyOrderCreateTime);
 
@@ -29,6 +43,11 @@
 
 	int  removeDistributedClient(String id);
 
+	List<Long> listAgentId(@Param("query") KeyOrderMapper.DaoQuery query);
+
+	long countAgentId(@Param("query") KeyOrderMapper.DaoQuery query);
+
+
 	public static class DaoQuery{
 		public String id;
 		public String key;
@@ -37,6 +56,8 @@
 		public Long uid;
 		public Integer orderState;
 		public Integer state;
+		public Boolean hasPayTime;
+		public Boolean hasAgentId;
 		public Long agentId;
 		public List<Integer> stateList;
 		public String stateDesc;
@@ -47,6 +68,10 @@
 		public Date maxCreateTime;
 		public Date minUpdateTime;
 		public Date maxUpdateTime;
+		public Date oMinCreateTime;
+		public Date oMaxCreateTime;
+
+		public String nickName;
 		public long start;
 		public int count;
 		public List<String> sortList;

--
Gitblit v1.8.0