From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 ed21be0..c90e46d 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
@@ -2,8 +2,8 @@
 
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.pojo.PaginationVO;
-import com.matrix.system.hive.bean.MoneyCardUse;
 import com.matrix.system.hive.bean.SysProjUse;
+import com.matrix.system.hive.dto.ProjUseOperationDto;
 import com.matrix.system.hive.plugin.util.BaseServices;
 
 import java.util.List;
@@ -135,7 +135,16 @@
 	 */
 	public AjaxResult activeProj(SysProjUse proj);
 
+	/**
+	 * 添加用户套餐和项目
+	 *
+	 * @param projUseDtoList
+	 * @return
+	 */
+	public void addUserProjUse(List<ProjUseOperationDto> projUseDtoList) ;
 
+
+	public void projectTk(List<ProjUseOperationDto> projUseDtoList);
 
 	public int updateProjUseTck(SysProjUse projUse);
 
@@ -145,4 +154,11 @@
 	public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse);
 
 	int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId);
+
+	/**
+	 * 取消订单删除项目
+	 * 只有没有使用过的才能被删除
+	 * @param id
+	 */
+    void deleteByOrderItemId(Long id);
 }
\ No newline at end of file

--
Gitblit v1.9.1