From ad018e22f49a803716692689c15c1d73d23f234c Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 6 Sep 2023 09:35:39 +0800 Subject: [PATCH] update --- .../impl/MemberBasicInfoServiceImpl.java | 20 +++++++++---------- .../impl/OrderBasicInfoServiceImpl.java | 12 ++++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 0f3166705..cd0674a35 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -295,16 +295,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { * @return */ @Override - public List selectMemberList(QueryMemberInfoDTO dto) { - // 获取登录账号信息 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); - if (authorizedMap == null) { - return new ArrayList<>(); - } - List merchantDeptIds = authorizedMap.getMerchantDeptIds(); - if (CollectionUtils.isNotEmpty(merchantDeptIds)) { - dto.setMerchantDeptIds(merchantDeptIds); - } + public List selectMemberList(QueryMemberInfoDTO dto) { + // // 获取登录账号信息 + // AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + // if (authorizedMap == null) { + // return new ArrayList<>(); + // } + // List merchantDeptIds = authorizedMap.getMerchantDeptIds(); + // if (CollectionUtils.isNotEmpty(merchantDeptIds)) { + // dto.setMerchantDeptIds(merchantDeptIds); + // } return memberBasicInfoMapper.selectMemberList(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 06df5037c..98dc357b3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3328,11 +3328,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); } - // 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致 - String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); - String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); - if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { - throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); + if (StringUtils.isNotBlank(dto.getAppId())) { + // 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致 + String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); + String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); + if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { + throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); + } } // 如果是鉴权卡或者vin启动，不判断枪口状态