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 132cb63fb..92ebc5eb2 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 @@ -96,16 +96,23 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { */ @Override public int insertPileAuthCardForWeb(PileAuthCardDTO dto) { - // 通过手机号查询memberId - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); - if (memberBasicInfo == null) { - // 为空则说明未查到该用户的注册信息 - throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); + MemberBasicInfo memberBasicInfo = new MemberBasicInfo(); + if (dto.getPhoneNumber() == null) { + memberBasicInfo.setMemberId(null); + memberBasicInfo.setStatus("0"); // 0-待激活 + }else { + // 通过手机号查询memberId + memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); + if (memberBasicInfo == null) { + // 为空则说明未查到该用户的注册信息 + throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); + } + memberBasicInfo.setStatus("1"); // 1-正常使用 } PileAuthCard pileAuthCard = PileAuthCard.builder() .logicCard(dto.getLogicCard()) .memberId(memberBasicInfo.getMemberId()) - .status("1") + .status(memberBasicInfo.getStatus()) .build(); return pileAuthCardMapper.insertPileAuthCard(pileAuthCard); } @@ -133,6 +140,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { .id(dto.getId()) .logicCard(dto.getLogicCard()) .memberId(memberBasicInfo.getMemberId()) + .status(dto.getStatus()) .build(); return pileAuthCardMapper.updatePileAuthCard(pileAuthCard); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index c79708139..359dbd713 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -51,7 +51,7 @@ t2.mobile_number as phoneNumber, t2.nick_name as nickName from pile_auth_card t1 - join member_basic_info t2 on t1.member_id = t2.member_id + left join member_basic_info t2 on t1.member_id = t2.member_id where t1.del_flag = '0' and t1.id = #{id} @@ -144,7 +144,7 @@ t2.mobile_number as phoneNumber, t2.nick_name as nickName from pile_auth_card t1 - join member_basic_info t2 on t1.member_id = t2.member_id + left join member_basic_info t2 on t1.member_id = t2.member_id where t1.del_flag = '0' and t1.logic_card = #{logicCard} and t1.physics_card = #{physicsCard} diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index 318af82e4..8a356600d 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -137,6 +137,20 @@ + + + + + +