From 3868b706ee3ee115a400d77abc3b69b83ea448c7 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Fri, 03 Sep 2021 14:15:36 +0800 Subject: [PATCH] bug123 --- zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 a9e453a..bdf9228 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 @@ -1,14 +1,14 @@ package com.matrix.system.hive.service; -import java.util.List; - +import com.matrix.core.pojo.PaginationVO; 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; - -import com.matrix.core.pojo.PaginationVO; import com.matrix.system.hive.plugin.util.BaseServices; + +import java.util.List; +import java.util.Map; /** * @@ -109,10 +109,12 @@ public void modifyAchieveTime(AchieveNew achieveNew); - List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo); + List<Map<String, Object>> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo); int findVipConsumeStatisticsTotal(AchieveNew achieveNew); public UserAchieveVo findUserAchieveByTime(int type); + public List<AchieveNew> findOrderItemAchieve(Long orderid); + } \ No newline at end of file -- Gitblit v1.9.1