From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java | 16 +++++++++++----- 1 files changed, 11 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..0698dac 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,15 @@ 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 com.matrix.system.hive.vo.DailyBeautyListVo; + +import java.util.List; +import java.util.Map; /** * @@ -109,10 +110,15 @@ 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); + + List<DailyBeautyListVo> findDailyBeautyList(AchieveNew achieveNew, PaginationVO pageVo); + int findDailyBeautyListTotal(AchieveNew achieveNew); + } \ No newline at end of file -- Gitblit v1.9.1