From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
index 21ef522..468c905 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.mybatis.user;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -31,4 +32,22 @@
List<Map<String, Object>> countSameDayByChannel(@Param("channel")String channel,
@Param("type")Integer type, @Param("years") String years,
@Param("startTime")String startTime, @Param("endTime")String endTime);
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑鏁伴噺
+ * @param channel
+ * @return
+ */
+ List<Map<String, Object>> countSameDayAndBuyGoodsByChannel(@Param("channel")String channel,
+ @Param("type")Integer type, @Param("years") String years,
+ @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+ /**
+ * 缁熻
+ * @param channel
+ * @return
+ */
+ Map<String, BigDecimal> countOneWeekUserInfo(@Param("channel")String channel,
+ @Param("startTime")String startTime, @Param("endTime")String endTime,
+ @Param("orderNumber")Integer orderNumber);
}
\ No newline at end of file
--
Gitblit v1.8.0