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

update

Browse Source
This commit is contained in:
Lemon
2023-09-06 09:35:39 +08:00
parent f1947e859f
commit ad018e22f4
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,15 +296,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
*/ */
@Override @Override
public List<MemberVO> selectMemberList(QueryMemberInfoDTO dto) { public List<MemberVO> selectMemberList(QueryMemberInfoDTO dto) {
// 获取登录账号信息 // // 获取登录账号信息
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); // AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) { // if (authorizedMap == null) {
return new ArrayList<>(); // return new ArrayList<>();
} // }
List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds(); // List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
if (CollectionUtils.isNotEmpty(merchantDeptIds)) { // if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
dto.setMerchantDeptIds(merchantDeptIds); // dto.setMerchantDeptIds(merchantDeptIds);
} // }
return memberBasicInfoMapper.selectMemberList(dto); return memberBasicInfoMapper.selectMemberList(dto);
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -3328,12 +3328,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN);
} }
if (StringUtils.isNotBlank(dto.getAppId())) {
// 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致 // 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致
String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId());
String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId());
if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) {
throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致");
} }
}
// 如果是鉴权卡或者vin启动，不判断枪口状态 // 如果是鉴权卡或者vin启动，不判断枪口状态
if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue()) if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue())