From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 edd3b33..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
@@ -144,10 +144,18 @@
/**
- * 缁熻鏂板鐢ㄦ埛
+ * 缁熻鏂板鐢ㄦ埛褰撴棩浜х敓璁㈠崟鐢ㄦ埛鏁伴噺
* @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