From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
index 853b5c5..6f09cb7 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -22,9 +23,7 @@
 
 	public int update(SysVipInfo sysVipInfo);
 
-	public int deleteByIds(@Param("list") List<Long> list);
-
-	public int deleteById(Long id);
+	public int deleteLogicByIds(@Param("list") List<Long> list);
 
 	public List<SysVipInfo> selectInPage(@Param("record") SysVipInfo sysVipInfo, @Param("pageVo") PaginationVO pageVo);
 
@@ -189,7 +188,7 @@
 	public int selectSecondTotalRecord(@Param("record") SysVipInfo sysVipInfo);
 
 
-	public SysVipInfo selectByPhone(String phone);
+	public SysVipInfo selectByPhone(@Param("phone") String phone,@Param("companyId") Long companyId);
 
 
 
@@ -208,4 +207,14 @@
 	List<VipInfoListVo> selectVipAddressBookByList(@Param("record") VipInfoListDto vipInfoListDto);
 
 	com.matrix.system.app.vo.VipInfoVo selectVipInfoById(@Param("id") Long id);
+
+	public SysVipInfo findByOpenId(String openId);
+
+	int unbundlingSaleMan(Long userId);
+
+	int bindingRecommend(@Param("recommendId") Long recommendId,@Param("userId") Long userId);
+
+	List<Map<String, Object>> selectVipArrearsStatistics(@Param("record") SysVipInfo sysVipInfo, @Param("pageVo") PaginationVO pageVo);
+
+	Integer selectVipArrearsStatisticsTotal(@Param("record") SysVipInfo sysVipInfo);
 }
\ No newline at end of file

--
Gitblit v1.9.1