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/service/imp/SysVipInfoServiceImpl.java |   14 +++-----------
 1 files changed, 3 insertions(+), 11 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 9933f81..c92d1b7 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
@@ -137,6 +137,7 @@
 		}else{
 			sysVipInfo.setPhoto(defaultWoman);
 		}
+		sysVipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(sysVipInfo);
 		//创建用户默认储值卡
 		addVipDefaultCard(sysVipInfo.getId());
@@ -173,12 +174,7 @@
 		return sysVipInfoDao.update(sysVipInfo);
 	}
 
-	@Override
-	public int remove(List<Long> list) {
 
-		return sysVipInfoDao.deleteByIds(list);
-
-	}
 
 	@Override
 	public int removeLogic(List<Long> list) {
@@ -187,12 +183,6 @@
 
 	}
 
-	@Override
-	public int removeById(Long id) {
-
-		return sysVipInfoDao.deleteById(id);
-
-	}
 
 	@Override
 	public List<SysVipInfo> findInPage(SysVipInfo sysVipInfo, PaginationVO pageVo) {
@@ -355,6 +345,7 @@
 		}else{
 			sysVipInfo.setPhoto(defaultWoman);
 		}
+		sysVipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(sysVipInfo);
 		modifyVipWithOtherInfo(sysVipInfo);
 		return i;
@@ -510,6 +501,7 @@
 		}else{
 			vipInfo.setPhoto(defaultWoman);
 		}
+		vipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(vipInfo);
 
 		if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {

--
Gitblit v1.9.1