From 81e00cd2e26e387d8ab2077ccd982072d6eb865b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:40:31 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java
index e21b943..98eb791 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java
@@ -6,6 +6,7 @@
 import com.matrix.system.app.dto.VipInfoListDto;
 import com.matrix.system.app.vo.VipInfoDetailVo;
 import com.matrix.system.app.vo.VipInfoListVo;
+import com.matrix.system.hive.bean.MoneyCardUse;
 import com.matrix.system.hive.bean.SysVipInfo;
 import com.matrix.system.hive.plugin.util.BaseServices;
 import com.matrix.system.hive.pojo.VipInfoVo;
@@ -13,6 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -20,7 +22,7 @@
  */
 public interface SysVipInfoService  extends BaseServices<SysVipInfo>{
 
-	public  int addVipDefaultCard(Long vipId);
+	public MoneyCardUse addVipDefaultCard(Long vipId);
 	/**
 	 * 新增SysVipInfo
 	 * 
@@ -39,6 +41,13 @@
 	 * 
 	 */
 	public int remove(List<Long> list);
+
+
+	/**
+	 * 批量删除SysVipInfo
+	 *
+	 */
+	public int removeLogic(List<Long> list);
 
 	/**
 	 * 根据id删除SysVipInfo
@@ -195,4 +204,17 @@
 		int apiModifyVip(ModifyVipDto modifyVipDto);
 
 		VipInfoDetailVo findVipInfoDetail(Long id);
+
+
+	/**
+	 * 设置为推广员
+	 * @param invitationId
+	 */
+	public int setToBeAnSalesman(Long userId,Long invitationId,long gradeId);
+
+    SysVipInfo findByOpenId(String openId);
+
+    List<Map<String, Object>> findVipArrearsStatistics(SysVipInfo sysVipInfo, PaginationVO pageVo);
+
+	Integer findVipArrearsStatisticsTotal(SysVipInfo sysVipInfo);
 }
\ No newline at end of file

--
Gitblit v1.9.1