mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update
This commit is contained in:
@@ -642,11 +642,26 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
|
||||
List<String> merchantIdList = merchantInfoVOList.stream()
|
||||
.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
|
||||
|
||||
List<String> queryMerchantIds;
|
||||
|
||||
// 权限校验一下
|
||||
if (StringUtils.isNotBlank(dto.getMerchantId())) {
|
||||
if (!merchantIdList.contains(dto.getMerchantId())) {
|
||||
throw new BusinessException("403", "没有权限查询该运营商数据");
|
||||
}
|
||||
// 只查当前筛选的运营商
|
||||
queryMerchantIds = Collections.singletonList(dto.getMerchantId());
|
||||
} else {
|
||||
// 查全部权限内的运营商
|
||||
queryMerchantIds = merchantIdList;
|
||||
}
|
||||
|
||||
// 分页
|
||||
int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
|
||||
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
|
||||
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(queryMerchantIds, dto);
|
||||
|
||||
if (CollectionUtils.isNotEmpty(resultList)) {
|
||||
for (MerchantVipVO merchantVipVO : resultList) {
|
||||
BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance();
|
||||
|
||||
Reference in New Issue
Block a user