From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 7 +++++--
1 files changed, 5 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 d496984..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,7 +184,7 @@
@Override
public int remove(List<Long> list) {
- return sysVipInfoDao.deleteByIds(list);
+ return sysVipInfoDao.deleteLogicByIds(list);
}
@@ -197,7 +198,7 @@
@Override
public int removeById(Long id) {
- return sysVipInfoDao.deleteById(id);
+ return sysVipInfoDao.deleteLogicByIds(Arrays.asList(id));
}
@@ -362,6 +363,7 @@
}else{
sysVipInfo.setPhoto(defaultWoman);
}
+ sysVipInfo.setIsDelete(Dictionary.DELETED_N);
int i=sysVipInfoDao.insert(sysVipInfo);
modifyVipWithOtherInfo(sysVipInfo);
return i;
@@ -517,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