autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YAS\29473
2025-11-18 11:21:25 +08:00
parent 277fad8918
commit 04bce01583
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -1514,7 +1514,7 @@ public class TempService {
throw new RuntimeException("订单不是异常订单：" + orderCode);
}
if (!Objects.equals(orderBasicInfo.getPayMode(), PayModeEnum.PAYMENT_OF_WHITELIST.getValue())) {
if (!Objects.equals(orderBasicInfo.getPayMode(), "3")) {
throw new RuntimeException("订单不是白名单支付方式：" + orderCode);
}

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -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();