From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java | 12 +++++++++---
1 files changed, 9 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 0f32f68..1295c04 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
@@ -38,7 +38,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
@@ -134,7 +134,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);
/**
* 会员活跃状态自动修改
@@ -189,7 +189,7 @@
public int selectSecondTotalRecord(@Param("record") SysVipInfo sysVipInfo);
- public SysVipInfo selectByPhone(String phone);
+ public SysVipInfo selectByPhone(@Param("phone") String phone,@Param("companyId") Long companyId);
@@ -206,4 +206,10 @@
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);
}
\ No newline at end of file
--
Gitblit v1.9.1