From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 a283ccf..6e0e060 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
@@ -2,6 +2,9 @@
 
 import com.matrix.core.exception.GlobleException;
 import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.app.dto.OrderListDto;
+import com.matrix.system.app.vo.OrderDetailVo;
+import com.matrix.system.app.vo.RankingVo;
 import com.matrix.system.hive.bean.SysOrder;
 import com.matrix.system.hive.plugin.util.BaseServices;
 import com.matrix.system.hive.pojo.CzXkVo;
@@ -81,6 +84,8 @@
 	 */
 	public void updateReceiptMoney(SysOrder sysOrder) throws GlobleException;
 
+	public void refundOrderMoney(SysOrder sysOrder);
+
 	/**
 	 * 创建订单
 	 * @param session
@@ -128,4 +133,13 @@
 	SysOrder checkAndSaveOrder(SysOrder sysOrder);
 
 	SysOrder findSysOrderTjByVipId(Long vipId);
+
+	List<OrderDetailVo> findApiOrderListInPage(OrderListDto orderListDto, PaginationVO pageVo);
+
+	int findApiOrderListTotal(OrderListDto orderListDto);
+
+	OrderDetailVo findApiOrderDetailByOrderId(Long orderId);
+
+	List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);
+
 }
\ No newline at end of file

--
Gitblit v1.9.1