From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 0d5f436..cd93e2d 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
@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -196,4 +197,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