From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 6e7f1ec..fd8fba7 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
@@ -1,11 +1,14 @@
package com.matrix.system.hive.dao;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.app.dto.VipInfoListDto;
+import com.matrix.system.app.vo.VipInfoListVo;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.pojo.VipInfoVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
@@ -36,7 +39,7 @@
public SysVipInfo selectById(Long id);
- public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key, @Param("shopId") Long shopId);
+ public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key);
/**
* 查询是否唯一 @Title: selectTotalByField
@@ -132,7 +135,7 @@
* @param keyWord
* @return
*/
- public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord, @Param("shopId") Long shopId);
+ public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord,@Param("companyId") Long companyId);
/**
* 会员活跃状态自动修改
@@ -187,7 +190,7 @@
public int selectSecondTotalRecord(@Param("record") SysVipInfo sysVipInfo);
- public SysVipInfo selectByPhone(String phone);
+ public SysVipInfo selectByPhone(@Param("phone") String phone,@Param("companyId") Long companyId);
@@ -202,4 +205,18 @@
public int batchInsert(@Param("list") List<SysVipInfo> list);
public List<SysVipInfo> selectVipInfoByVipNo(@Param("companyId") Long companyId, @Param("vipNo") String vipNo);
+
+ 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