From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 11:12:22 +0800
Subject: [PATCH] 合并服务单订单改造分支

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 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 9933f81..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
@@ -82,6 +82,13 @@
 	@Autowired
 	private SysOrderDao sysOrderDao;
 
+	@Override
+	public void updateDealStatus(Long vipId, int isDeal) {
+		SysVipInfo vipInfo = new SysVipInfo();
+		vipInfo.setIsDeal(isDeal);
+		vipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
+		sysVipInfoDao.update(vipInfo);
+	}
 
 	/**
 	 * 新增会员储值卡
@@ -137,6 +144,7 @@
 		}else{
 			sysVipInfo.setPhoto(defaultWoman);
 		}
+		sysVipInfo.setIsDelete(Dictionary.DELETED_N);
 		int i=sysVipInfoDao.insert(sysVipInfo);
 		//创建用户默认储值卡
 		addVipDefaultCard(sysVipInfo.getId());
@@ -176,7 +184,7 @@
 	@Override
 	public int remove(List<Long> list) {
 
-		return sysVipInfoDao.deleteByIds(list);
+		return sysVipInfoDao.deleteLogicByIds(list);
 
 	}
 
@@ -190,7 +198,7 @@
 	@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())) {
@@ -690,4 +700,5 @@
 	public Integer findVipArrearsStatisticsTotal(SysVipInfo sysVipInfo) {
 		return sysVipInfoDao.selectVipArrearsStatisticsTotal(sysVipInfo);
 	}
+
 }
\ No newline at end of file

--
Gitblit v1.9.1