From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
index 23cfd15..177ca3d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
@@ -12,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpSession;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -38,7 +39,7 @@
 	 */
 	public int remove(List<Long> list);
 
-	public int cancelOrder(Long id);
+	public void cancelOrder(Long id);
 	/**
 	 * 根据id删除SysOrder
 	 *
@@ -142,5 +143,7 @@
 
 	List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);
 
-	List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder);
+	BigDecimal findVipArrearsByVipId(Long vipId);
+
+    List<SysOrder> findByIds(List<Long> orderIds);
 }
\ No newline at end of file

--
Gitblit v1.9.1