diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index a846ce203..a084c8ac2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -326,4 +326,24 @@ public class MemberController extends BaseController { logger.info("用户绑定鉴权卡 result:{}", response); return response; } + + @PostMapping("/memberUnbindingCard") + public RestApiResponse memberUnbindingCard(HttpServletRequest request, @RequestBody BindingCardDTO dto) { + logger.info("用户解绑鉴权卡 param:{}", JSONObject.toJSONString(dto)); + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + int i = memberService.memberUnbindCard(dto); + response = new RestApiResponse<>(i); + } catch (BusinessException e) { + logger.error("用户解绑鉴权卡 error", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("用户解绑鉴权卡 error", e); + response = new RestApiResponse<>(e); + } + logger.info("用户解绑鉴权卡 result:{}", response); + return response; + } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 74ee89ef1..f2b15a49d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -275,10 +275,10 @@ public class MemberService { .mobileNumber(dto.getPhoneNumber()) .verificationCode(dto.getVerificationCode()) .build(); - // checkVerificationCode(registerAndLoginDTO); + checkVerificationCode(registerAndLoginDTO); // 判断当前鉴权卡是否被绑定过 PileAuthCard authCard = PileAuthCard.builder() - .physicsCard(dto.getPhysicsCard()) + .logicCard(dto.getLogicCard()) .build(); PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(authCard); if (pileAuthCardInfo == null){ @@ -295,4 +295,30 @@ public class MemberService { authCard.setId(pileAuthCardInfo.getId()); return pileAuthCardService.updatePileAuthCard(authCard); } + + /** + * 用户解绑鉴权卡 + * @param dto + * @return + */ + public int memberUnbindCard(BindingCardDTO dto) { + // 校验短信验证码 + MemberRegisterAndLoginDTO registerAndLoginDTO = MemberRegisterAndLoginDTO.builder() + .mobileNumber(dto.getPhoneNumber()) + .verificationCode(dto.getVerificationCode()) + .build(); + // checkVerificationCode(registerAndLoginDTO); + // 校验身份信息 + PileAuthCard authCard = PileAuthCard.builder() + .logicCard(dto.getLogicCard()) + .memberId(dto.getMemberId()) + .build(); + PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(authCard); + if (pileAuthCardInfo == null){ + // 为空说明没查到此卡信息 + throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO); + } + // 解绑鉴权卡 + return pileAuthCardService.unBindingCard(authCard); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java index 7a276d102..078411c11 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java @@ -67,4 +67,6 @@ public interface PileAuthCardMapper { * @return 结果 */ public int deletePileAuthCardByIds(Long[] ids); + + int unBindingCard(PileAuthCard pileAuthCard); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java index badce923b..61b38b3b3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java @@ -65,4 +65,6 @@ public interface IPileAuthCardService { * @return 结果 */ public int deletePileAuthCardById(Long id); + + int unBindingCard(PileAuthCard pileAuthCard); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index 4dd845ce9..bf28692a1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -95,4 +95,9 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { public int deletePileAuthCardById(Long id) { return pileAuthCardMapper.deletePileAuthCardById(id); } + + @Override + public int unBindingCard(PileAuthCard pileAuthCard) { + return pileAuthCardMapper.unBindingCard(pileAuthCard); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index 9b21b95a8..bc72771d7 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -109,4 +109,11 @@ limit 1 + + + update pile_auth_card + set status = '9', del_flag = '1' + where member_id = #{memberId,jdbcType=VARCHAR} + and logic_card = #{logicCard,jdbcType=VARCHAR} + \ No newline at end of file