From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java | 13 +++++++++---- 1 files changed, 9 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 52e9ac0..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); @@ -212,4 +211,10 @@ 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