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

Revert "update"

Browse Source 
This reverts commit 71be841f4d65a63a61059bb45bbc6e6f4bb35b42.
This commit is contained in:
Guoqs
2024-05-28 11:54:57 +08:00
parent cc777bd9fb
commit 61e40908b2
5 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
// 来自后管的充值，校验权限
if (StringUtils.equals(dto.getFromWeb(), Constants.ONE)) {
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = UserUtils.getMerchantInfoVOList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
List<String> collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
if (!collect.contains(targetMerchantId)) {
throw new BusinessException(ReturnCodeEnum.CODE_PERMISSION_DENIED);
@@ -520,8 +520,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
// dto.setMerchantId(id);
// }
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<String> firstMerchantIdList = UserUtils.getFirstMerchantIdList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<String> firstMerchantIdList = loginUserDetail.getFirstMerchantIdList();
if (CollectionUtils.isNotEmpty(firstMerchantIdList)) {
dto.setFirstMerchantIds(firstMerchantIdList);
}
@@ -609,8 +609,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
@Override
public List<MerchantVipVO> queryMerchantVipList(QueryMemberInfoDTO dto) {
// 获取后管登录用户的权限
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = UserUtils.getMerchantInfoVOList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
List<String> merchantIdList = merchantInfoVOList.stream()
.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.jsowell.pile.service.impl;
import com.github.pagehelper.PageInfo;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
@@ -90,13 +89,12 @@ public class PileAuthCardServiceImpl implements PileAuthCardService {
*/
@Override
public List<PileAuthCardVO> getPileAuthCardInfoList(PileAuthCardDTO dto) {
// LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = UserUtils.getMerchantInfoVOList();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
List<String> merchantIdList = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
dto.setMerchantIdList(merchantIdList);
PageUtils.startPage();
List<PileAuthCardVO> pileAuthCardInfoList = pileAuthCardMapper.getPileAuthCardInfoList(dto);
return pileAuthCardInfoList;
return pileAuthCardMapper.getPileAuthCardInfoList(dto);
}
/**