From e04735fb7d9cf321f262a1d5338adc92d4856bc0 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 14:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' 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