From 58508692587d5d99ae905e8f1e4e4249ffb3b08a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 09 Jan 2021 16:32:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
index 09757e9..a9e453a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.matrix.system.app.vo.UserAchieveVo;
 import com.matrix.system.hive.bean.AchieveNew;
 import com.matrix.system.hive.bean.SysOrder;
 import com.matrix.system.hive.bean.SysProjServices;
@@ -108,5 +109,10 @@
 
 	public void modifyAchieveTime(AchieveNew achieveNew);
 
+	List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo);
+
+	int findVipConsumeStatisticsTotal(AchieveNew achieveNew);
+
+	public UserAchieveVo findUserAchieveByTime(int type);
 
 }
\ No newline at end of file

--
Gitblit v1.9.1