From e8f425221ba95ee55c85ea6b92f3e38e2cdf292a Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 16 Mar 2023 11:18:10 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=20=E4=B8=AA=E4=BA=BA=E6=A1=A9?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=A1=A9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/PileService.java | 16 +++++++++++----- .../jsowell/common/enums/ykc/ReturnCodeEnum.java | 2 ++ 2 files changed, 13 insertions(+), 5 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 a7416ce08..a3b65eb1e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -243,6 +243,17 @@ public class PileService { .build(); memberService.checkVerificationCode(registerAndLoginDTO); + // 判断桩是否为个人桩 + PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(dto.getPileSn()); + if (pileBasicInfo == null) { + // 未查到则说明没有此桩 + throw new BusinessException(ReturnCodeEnum.CODE_PILE_NOT_INFO); + } + String businessType = pileBasicInfo.getBusinessType(); + if (!StringUtils.equals(BusinessTypeEnum.INDIVIDUAL_PILE.getValue(), businessType)){ + // 不一致则此桩不是个人桩 + throw new BusinessException(ReturnCodeEnum.CODE_THIS_PILE_NOT_PERSONAL_PILE); + } // 检查桩是否已经被绑定 PileMemberRelation pileMemberRelation = new PileMemberRelation(); pileMemberRelation.setPileSn(dto.getPileSn()); @@ -252,11 +263,6 @@ public class PileService { throw new BusinessException(ReturnCodeEnum.CODE_PILE_HAS_BEEN_BINDING_ERROR); } // 如果没被绑定，先校验桩密钥是否一致 - PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(dto.getPileSn()); - if (pileBasicInfo == null) { - // 未查到则说明没有此桩 - throw new BusinessException(ReturnCodeEnum.CODE_PILE_NOT_INFO); - } if (!StringUtils.equals(pileBasicInfo.getSecretKey(), dto.getSecretKey())) { // 错误的密钥信息 throw new BusinessException(ReturnCodeEnum.CODE_SECRET_KEY_ERROR); diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 8118061f5..5401d694d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -121,6 +121,8 @@ public enum ReturnCodeEnum { CODE_PILE_NOT_INFO("00400012", "未查到该该桩的信息，请检查！"), CODE_SECRET_KEY_ERROR("00400013", "填写的桩密钥有误，请检查！"), + + CODE_THIS_PILE_NOT_PERSONAL_PILE("00400014", "此桩不是个人桩！"), ; private String value;