From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index 645d0a1..922b7d9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -74,7 +74,7 @@
 	 * @return
 	 */
 	@Override
-	public  int addVipDefaultCard(Long vipId){
+	public MoneyCardUse addVipDefaultCard(Long vipId){
 		MoneyCardUse defaultCardUse=new MoneyCardUse();
 		defaultCardUse.setVipId(vipId);
 		defaultCardUse.setCardName("储值卡");
@@ -83,7 +83,8 @@
 		defaultCardUse.setGiftMoney(0D);
 		defaultCardUse.setSource("-");
 		defaultCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
-		return  moneyCardUseDao.insert(defaultCardUse);
+		moneyCardUseDao.insert(defaultCardUse);
+		return  defaultCardUse;
 
 	}
 
@@ -212,8 +213,7 @@
 
 	@Override
 	public List<SysVipInfo> findByVipNoOrTel(String key) {
-		SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		return sysVipInfoDao.selectByVipNoOrTel(key, users.getShopId());
+		return sysVipInfoDao.selectByVipNoOrTel(key);
 
 	}
 
@@ -294,8 +294,8 @@
 
 	@Override
 	public List<SysVipInfo> findUserByKey(String keyWord) {
-		SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		return sysVipInfoDao.selectUserByKey(keyWord, users.getShopId());
+		SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+		return sysVipInfoDao.selectUserByKey(keyWord,user.getCompanyId());
 	}
 	
 

--
Gitblit v1.9.1