From 9d401723afe4fd680f60f97b8d927efea6344a6f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 14:54:22 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 bbd72a1..909d82c 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
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
import org.apache.ibatis.annotations.Param;
@@ -38,13 +39,13 @@
BigDecimal getMyHB(Long id);
// 鏍规嵁AppId涓庡井淇nionID鑾峰彇鐢ㄦ埛
- UserInfo getUserInfoByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
+ List<UserInfo> listByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
// 鏍规嵁AppId涓庢窐瀹漁penId鑾峰彇鐢ㄦ埛
- UserInfo getUserInfoByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
+ List<UserInfo> listByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
- UserInfo getUserInfoByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
+ List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
Long getMaxUid();
@@ -109,7 +110,7 @@
* @param minMoney
* @return
*/
- double countAllMoney(@Param("minMoney") Double minMoney);
+ BigDecimal countAllMoney(@Param("minMoney") Double minMoney);
/**
@@ -119,4 +120,51 @@
*/
List<Long> longTimeNoLogin(@Param("daysNum") int daysNum, @Param("list") List<Long> list);
+ /**
+ * 缁熻娴佸け鐢ㄦ埛鏁伴噺:锛� num 澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
+ * @param num 180
+ * @return
+ */
+ long countLoseUser(@Param("num") int num);
+
+
+ /**
+ * 绱鏈夎喘涔扮敤鎴锋暟
+ * @return
+ */
+ long countHasOrderUser();
+
+
+ /**
+ * 缁熻鏂板鐢ㄦ埛
+ * @return
+ */
+ 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);
+
+
+ /**
+ * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+ * @param phone
+ * @param inviteCode
+ * @return
+ */
+ UserInfo getInfoByPhoneOrInviteCode(@Param("phone")String phone, @Param("inviteCode")String inviteCode);
+
}
\ No newline at end of file
--
Gitblit v1.8.0