From 1bb79a70a9e4f0046a66a72ec399fa66bc07af02 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 02 Nov 2021 11:18:41 +0800 Subject: [PATCH] fix --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 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..359169f 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; @@ -77,6 +78,9 @@ @Autowired ScoreVipDetailService scoreVipDetailService; + + @Autowired + private SysOrderDao sysOrderDao; /** @@ -429,17 +433,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 -- Gitblit v1.9.1