From 9974b1fffff1cad712b7c30fb4c708ef45ec4b8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:44:03 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
index 82f5810..df034a0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
@@ -94,12 +94,7 @@
 	public int invalidTc(SysProjUse sysProjUse);
 	
 
-	/**
-	 * 退款
-	 * @param sysProjUse
-	 * @return
-	 */
-	public int returnMoneyTc(SysProjUse sysProjUse, MoneyCardUse cardUse, Long moneyCardUseId);
+
 	/**
 	 * 设置为有效套餐
 	 * @param proj
@@ -134,28 +129,16 @@
 	
 
 	/**
-	 * 退款
-	 * @param sysProjUse
-	 * @return
-	 */
-	public int returnMoneyProj(SysProjUse sysProjUse, MoneyCardUse cardUse, Long moneyCardUseId);
-	/**
 	 * 设置为有效套餐
 	 * @param proj
 	 * @return
 	 */
 	public AjaxResult activeProj(SysProjUse proj);
-	/**
-	 * 退款项目
-	 * @param sysProjUse
-	 * @return
-	 */
-	public double getTotalMoneyProj(SysProjUse sysProjUse);
 
 
 
 	public int updateProjUseTck(SysProjUse projUse);
 
 
-	public List<SysProjUse> selectTaocanProjUse(Long id);
+	public List<SysProjUse> selectTaocanProjUse(Long id, String status);
 }
\ No newline at end of file

--
Gitblit v1.9.1