From 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:45:49 +0800
Subject: [PATCH] Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
index 3ebd60b..46ee09f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
@@ -64,7 +64,13 @@
 
 	List<OrderDetailAchieveItemVo> selectApiOrderItemAchieve(@Param("itemId") Long itemId);
 
-	List<RankingVo> selectShopConsumeAchieveRanking(AchieveNew achieveNew);
+	List<RankingVo> selectShopConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);
 
-	List<RankingVo> selectBeauticianConsumeAchieveRanking(AchieveNew achieveNew);
+	List<RankingVo> selectShopSaleAchieveRanking(@Param("record") AchieveNew achieveNew);
+
+	List<RankingVo> selectBeauticianConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);
+
+	List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);
+
+	List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") AchieveNew achieveNew);
 }
\ No newline at end of file

--
Gitblit v1.9.1