From 5edd20eeb792e3dcad99554046f6e3c41a2af430 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Fri, 09 May 2025 16:04:49 +0800 Subject: [PATCH] feat(mall): 添加核销记录功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java index a718f66..d661368 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java @@ -678,6 +678,9 @@ wallet.setMemberId(mallMember.getId()); mallMemberWalletMapper.insert(wallet); } else { + if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) { + throw new FebsException("账号已停用"); + } mallMember.setSessionKey(sessionKey); this.baseMapper.updateById(mallMember); } @@ -1342,18 +1345,19 @@ // 获取当前登录用户的ID Long memberId = LoginUserUtil.getLoginUser().getId(); + log.info("开始绑定医生{}",memberId); // 从DTO中提取邀请ID和门店会员ID String inviteId = dto.getInviteId(); Long storeMemberId = dto.getStoreMemberId(); // 根据门店会员ID查询门店会员信息 - MallStoreMember mallStoreMember = mallStoreMemberMapper.selectById(storeMemberId); + MallStoreMember mallStoreMember = mallStoreMemberMapper.selectOne( + new LambdaQueryWrapper<MallStoreMember>() + .eq(MallStoreMember::getId,storeMemberId) + .eq(MallStoreMember::getMemberId,memberId) + ); // 如果门店会员信息为空,抛出异常 if(null == mallStoreMember){ - throw new FebsException("当前检测记录无法绑定!"); - } - // 如果门店会员的会员ID与当前登录用户ID不匹配,抛出异常 - if(mallStoreMember.getMemberId() != memberId){ throw new FebsException("当前检测记录无法绑定!"); } @@ -1458,7 +1462,8 @@ ApiDoctorListVo apiDoctorListVo = new ApiDoctorListVo(); apiDoctorListVo.setId(mallDoctor.getId()); apiDoctorListVo.setStoreMemberId(mallDoctor.getStoreMemberId()); - apiDoctorListVo.setName(mallDoctor.getBindName()); + MallMember mallMember = this.baseMapper.selectById(mallDoctor.getMemberId()); + apiDoctorListVo.setName(mallMember.getName()); apiDoctorListVo.setPhone(mallDoctor.getBindPhone()); apiDoctorListVo.setBindAge(mallDoctor.getBindAge()); apiDoctorListVo.setBindInfo(mallDoctor.getBindInfo()); @@ -1477,7 +1482,7 @@ Long memberId = LoginUserUtil.getLoginUser().getId(); MallDoctor mallDoctor = mallDoctorMapper.selectById(dto.getId()); - if(memberId != mallDoctor.getBindMemberId()){ + if(!memberId.equals(mallDoctor.getBindMemberId())){ throw new FebsException("当前授权无法删除!"); } mallDoctorMapper.deleteById(dto.getId()); -- Gitblit v1.9.1