From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
index 99e8150..20ddbaa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
@@ -31,6 +31,17 @@
Long countOrderBySourceTypeAndDay(@Param("preDay") String preDay, @Param("sourceType") int sourceType);
+ /**
+ * 缁熻鎵�鏈夎鍗�
+ *
+ * @param channel
+ * @return
+ */
+ List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("sourceType") int sourceType);
+
+
/**
* 濂栭噾缁熻
@@ -133,6 +144,13 @@
List<CountOrderDTO> countValidOrderByDay(@Param("preDay") String preDay);
/**
+ * 鏌ヨ褰撴棩涓嬪崟鐢ㄦ埛
+ * @param preDay
+ * @return
+ */
+ List<Long> getUidByValidOrderByDay(@Param("preDay") String preDay);
+
+ /**
* 閫氳繃澶氫釜uid 鏃ユ湡绛涢�� 涓嬪崟鐢ㄦ埛鏁伴噺
* @param preDay
* @param uid
@@ -169,4 +187,22 @@
* @return
*/
Integer countOderByUidAndLess10(@Param("uid") Long uid);
+
+
+ List<Long> getDownOrderUserByListUidAndDate(@Param("preDay") Date preDay,@Param("list") List<Long> list);
+
+
+ /**
+ * 缁熻杩� day澶╂湁鏁堣鍗曟暟閲�
+ * @param uid
+ * @param source
+ * @param day
+ * @return
+ */
+ Long countOrderBySourceAndNearDay(@Param("uid") Long uid, @Param("source") int source, @Param("day") int day);
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0