From f83b62252df79afbfa19f4cf1be0487d9e37a123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:48:09 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 034df56..59e8f34 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
@@ -79,6 +79,16 @@
@Autowired
ScoreVipDetailService scoreVipDetailService;
+ @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);
+ }
/**
* 新增会员储值卡
@@ -120,7 +130,9 @@
}
}
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- sysVipInfo.setCompanyId(user.getCompanyId());
+ if(user!=null){
+ sysVipInfo.setCompanyId(user.getCompanyId());
+ }
sysVipInfo.setCreateTime(new Date());
sysVipInfo.setPointAll(0);
sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
@@ -427,8 +439,9 @@
@Override
public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
+ //todo 会员查询单独做控制
SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- if (!DataAuthUtil.hasAllShopAuth()) {
+ if (!DataAuthUtil.hasAllCustomerAuth()) {
vipInfoListDto.setShopId(sysUsers.getShopId());
}
QueryUtil.setQueryLimitCom(vipInfoListDto);
@@ -437,7 +450,9 @@
@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
@@ -666,5 +681,14 @@
}
+ @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