From 2066c9948b61831a147bf06af0b25b82b2ad61b4 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 11 Sep 2023 10:54:41 +0800 Subject: [PATCH] update --- .../java/com/jsowell/service/PileService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index cf82ef42f..16eff3827 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -328,6 +328,13 @@ public class PileService { * @param dto */ public void adminIssuePile(PileMemberBindingDTO dto) { + // 通过前端传的手机号查询是否有此用户 + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId()); + if (memberBasicInfo == null) { + // 为空说明此用户未注册平台账号 + throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); + } + List relationList = pileMemberRelationService.selectPileMemberRelationByPileSn(dto.getPileSn()); if (CollectionUtils.isEmpty(relationList)) { // 充电桩没有绑定任何人 @@ -352,14 +359,6 @@ public class PileService { .map(PileMemberRelation::getMemberId) .collect(Collectors.toList()); - - // 通过前端传的手机号查询是否有此用户 - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId()); - if (memberBasicInfo == null) { - // 为空说明此用户未注册平台账号 - throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); - } - if (userList.contains(memberBasicInfo.getMemberId())) { // 不为空说明已绑定 throw new BusinessException(ReturnCodeEnum.CODE_USER_HAS_BEEN_THIS_PILE);