From 0e5e21d2f3693dc993b3f49d88a275f7b226eba5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index 5061436..35faa38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -110,7 +110,7 @@
* @param minMoney
* @return
*/
- double countAllMoney(@Param("minMoney") Double minMoney);
+ BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
/**
@@ -139,6 +139,23 @@
* 缁熻鏂板鐢ㄦ埛
* @return
*/
- List<Map<String, Object>> countNewUserByDate(@Param("type")Integer type, @Param("years") String years,
+ List<Map<String, Object>> countNewUserByDate(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years,
@Param("startTime")String startTime, @Param("endTime")String endTime);
+
+
+ /**
+ * 缁熻鏂板鐢ㄦ埛褰撴棩浜х敓璁㈠崟鐢ㄦ埛鏁伴噺
+ * @return
+ */
+ List<Map<String, Object>> getTodayHasOrder(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years,
+ @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+
+ /**
+ * 缁熻鏂板鐢ㄦ埛涓�鍛ㄤ骇鐢熻鍗曠敤鎴锋暟閲�
+ * @return
+ */
+ Map<String, Object> getWeekHasOrder(@Param("channel")String channel, @Param("startTime")String startTime,
+ @Param("endTime")String endTime, @Param("orderNum")Integer orderNum);
+
}
\ No newline at end of file
--
Gitblit v1.8.0