From ec59428eacc798b8dfc617644aa9ca05066f2341 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sat, 02 Jul 2022 16:13:55 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 927d041..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
@@ -17,6 +17,7 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
@@ -78,6 +79,9 @@
@Autowired
ScoreVipDetailService scoreVipDetailService;
+ @Autowired
+ private SysOrderDao sysOrderDao;
+
/**
* 新增会员储值卡
@@ -133,6 +137,7 @@
}else{
sysVipInfo.setPhoto(defaultWoman);
}
+ sysVipInfo.setIsDelete(Dictionary.DELETED_N);
int i=sysVipInfoDao.insert(sysVipInfo);
//创建用户默认储值卡
addVipDefaultCard(sysVipInfo.getId());
@@ -169,19 +174,15 @@
return sysVipInfoDao.update(sysVipInfo);
}
- @Override
- public int remove(List<Long> list) {
- return sysVipInfoDao.deleteByIds(list);
+
+ @Override
+ public int removeLogic(List<Long> list) {
+
+ return sysVipInfoDao.deleteLogicByIds(list);
}
- @Override
- public int removeById(Long id) {
-
- return sysVipInfoDao.deleteById(id);
-
- }
@Override
public List<SysVipInfo> findInPage(SysVipInfo sysVipInfo, PaginationVO pageVo) {
@@ -344,6 +345,7 @@
}else{
sysVipInfo.setPhoto(defaultWoman);
}
+ sysVipInfo.setIsDelete(Dictionary.DELETED_N);
int i=sysVipInfoDao.insert(sysVipInfo);
modifyVipWithOtherInfo(sysVipInfo);
return i;
@@ -429,17 +431,19 @@
@Override
public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
//todo 会员查询单独做控制
-// SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-// if (!DataAuthUtil.hasAllShopAuth()) {
-// vipInfoListDto.setShopId(sysUsers.getShopId());
-// }
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ if (!DataAuthUtil.hasAllCustomerAuth()) {
+ vipInfoListDto.setShopId(sysUsers.getShopId());
+ }
QueryUtil.setQueryLimitCom(vipInfoListDto);
return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
}
@Override
public com.matrix.system.app.vo.VipInfoVo findApiVipInfoById(Long id) {
- return sysVipInfoDao.selectVipInfoById(id);
+ com.matrix.system.app.vo.VipInfoVo result = sysVipInfoDao.selectVipInfoById(id);
+ result.setArrears(sysOrderDao.selectArrearsByVipId(id));
+ return result;
}
@Override
@@ -497,6 +501,7 @@
}else{
vipInfo.setPhoto(defaultWoman);
}
+ vipInfo.setIsDelete(Dictionary.DELETED_N);
int i=sysVipInfoDao.insert(vipInfo);
if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {
@@ -668,5 +673,13 @@
}
+ @Override
+ public List<Map<String, Object>> findVipArrearsStatistics(SysVipInfo sysVipInfo, PaginationVO pageVo) {
+ return sysVipInfoDao.selectVipArrearsStatistics(sysVipInfo, pageVo);
+ }
+ @Override
+ public Integer findVipArrearsStatisticsTotal(SysVipInfo sysVipInfo) {
+ return sysVipInfoDao.selectVipArrearsStatisticsTotal(sysVipInfo);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1