From f2b9a83f75a4345cd42d008f3153c18f8f890cad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Sep 2022 13:54:17 +0800
Subject: [PATCH] fix:退款订单退业绩是订单状态的判断

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 59e8f34..9b36c55 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
@@ -144,6 +144,7 @@
 		}else{
 			sysVipInfo.setPhoto(defaultWoman);
 		}
+		sysVipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(sysVipInfo);
 		//创建用户默认储值卡
 		addVipDefaultCard(sysVipInfo.getId());
@@ -183,14 +184,21 @@
 	@Override
 	public int remove(List<Long> list) {
 
-		return sysVipInfoDao.deleteByIds(list);
+		return sysVipInfoDao.deleteLogicByIds(list);
+
+	}
+
+	@Override
+	public int removeLogic(List<Long> list) {
+
+		return sysVipInfoDao.deleteLogicByIds(list);
 
 	}
 
 	@Override
 	public int removeById(Long id) {
 
-		return sysVipInfoDao.deleteById(id);
+		return sysVipInfoDao.deleteLogicByIds(Arrays.asList(id));
 
 	}
 
@@ -355,6 +363,7 @@
 		}else{
 			sysVipInfo.setPhoto(defaultWoman);
 		}
+		sysVipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(sysVipInfo);
 		modifyVipWithOtherInfo(sysVipInfo);
 		return i;
@@ -510,6 +519,7 @@
 		}else{
 			vipInfo.setPhoto(defaultWoman);
 		}
+		vipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(vipInfo);
 
 		if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {

--
Gitblit v1.9.1