From b87c5549fe471167882192944db3f2d6b729476c Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 15 Mar 2024 14:13:55 +0800 Subject: [PATCH] 抽奖 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 434 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 273 insertions(+), 161 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 c5eb694..2a042be 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 @@ -1,20 +1,21 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.common.entity.FebsResponse; -import cc.mrbird.febs.common.enumerates.AgentLevelEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; +import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.*; +import cc.mrbird.febs.mall.conversion.MallGoodsConversion; +import cc.mrbird.febs.mall.conversion.MallMemberBankConversion; import cc.mrbird.febs.mall.conversion.MallMemberConversion; +import cc.mrbird.febs.mall.conversion.MallShopApplyConversion; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.ICommonService; -import cc.mrbird.febs.mall.vo.MallMemberVo; -import cc.mrbird.febs.mall.vo.MoneyFlowVo; -import cc.mrbird.febs.mall.vo.TeamListVo; +import cc.mrbird.febs.mall.vo.*; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -29,13 +30,13 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * @author wzy @@ -55,6 +56,10 @@ private final IApiMallMemberWalletService walletService; private final MallMemberPaymentMapper mallMemberPaymentMapper; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final MallShopApplyMapper mallShopApplyMapper; + private final MallRegisterAppealMapper mallRegisterAppealMapper; + private final MallMemberBankMapper mallMemberBankMapper; + @Value("${spring.profiles.active}") private String active; @@ -62,82 +67,38 @@ @Transactional(rollbackFor = Exception.class) @Override public FebsResponse register(RegisterDto registerDto) { - MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount()); - if (mallMember != null) { - throw new FebsException("该账号已被占用"); - } - String account = registerDto.getAccount(); + MallMember mallMember = this.baseMapper.selectInfoByAccount(account); + if (mallMember != null) { + throw new FebsException("账号已注册"); + } String code = registerDto.getCode(); - boolean flags = commonService.verifyCode(account, code); - if(!flags) { - throw new FebsException("验证码错误"); - } - - mallMember = new MallMember(); - mallMember.setPassword(SecureUtil.md5(registerDto.getPassword())); - - // 判断账号类型 - if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) { - mallMember.setPhone(registerDto.getAccount()); - } else { - mallMember.setEmail(registerDto.getAccount()); - } - - Integer count = this.baseMapper.selectCount(null); - if (count != null && count != 0) { - MallMember inviteMember = this.baseMapper.selectInfoByInviteId(registerDto.getInviteId()); - if (inviteMember == null) { - throw new FebsException("邀请码不存在"); + if(!AppContants.PUBLIC_CODE.equals(code)){ + boolean flags = commonService.verifyCode(account, code); + if (!flags) { + throw new FebsException("验证码错误"); } - - mallMember.setReferrerId(registerDto.getInviteId()); - } - mallMember.setName(registerDto.getAccount()); + mallMember = new MallMember(); + mallMember.setAccountLogin(account); + mallMember.setPassword(SecureUtil.md5(registerDto.getPassword())); + mallMember.setPhone(registerDto.getAccount()); + mallMember.setEmail(registerDto.getAccount()); + mallMember.setName(account); mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE); mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL); - mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name()); + mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode()); mallMember.setSex("男"); - + mallMember.setBindPhone(account); +// String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId()); +// mallMember.setInviteId(inviteId); this.baseMapper.insert(mallMember); - - String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId()); - mallMember.setInviteId(inviteId); - - //推荐人和推荐人链 - boolean flag = false; - String parentId = mallMember.getReferrerId(); - if (StrUtil.isBlank(parentId)) { - flag = true; - } - String ids = ""; - while (!flag) { - if (StrUtil.isBlank(ids)) { - ids += parentId; - } else { - ids += ("," + parentId); - } - MallMember parentMember = this.baseMapper.selectInfoByInviteId(parentId); - if (parentMember == null) { - break; - } - parentId = parentMember.getReferrerId(); - if (StrUtil.isBlank(parentMember.getReferrerId())) { - flag = true; - } - } - - if (StrUtil.isNotBlank(ids)) { - mallMember.setReferrerIds(ids); - } - this.baseMapper.updateById(mallMember); MallMemberWallet wallet = new MallMemberWallet(); wallet.setBalance(BigDecimal.ZERO); wallet.setMemberId(mallMember.getId()); mallMemberWalletMapper.insert(wallet); - return new FebsResponse().success().message("注册成功"); + return new FebsResponse().success().message("操作成功"); } @Override @@ -146,7 +107,7 @@ MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd); if (mallMember == null) { - throw new FebsException("用户不存在或账号密码错误"); + throw new FebsException("账号密码错误"); } if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) { @@ -166,7 +127,7 @@ redisUtils.set(token, JSONObject.toJSONString(mallMember), 360000); redisUtils.set(redisKey, token, 360000); Map<String, Object> authInfo = new HashMap<>(); - authInfo.put("token", token); +// authInfo.put("token", token); authInfo.put("rasToken", generateAsaToken(token)); return new FebsResponse().success().data(authInfo); } @@ -178,12 +139,14 @@ @Override public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) { - MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount()); + Long id = LoginUserUtil.getLoginUser().getId(); + MallMember mallMember = this.baseMapper.selectById(id); + if (mallMember == null) { throw new FebsException("账号不存在"); } - boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode()); + boolean b = commonService.verifyCode(mallMember.getPhone(), forgetPwdDto.getCode()); if (!b) { throw new FebsException("验证码错误"); } @@ -192,42 +155,23 @@ mallMember.setPassword(pwd); this.baseMapper.updateById(mallMember); - return new FebsResponse().success().message("重置成功"); + return new FebsResponse().success().message("操作成功"); } @Override public FebsResponse logout() { Long id = LoginUserUtil.getLoginUser().getId(); redisUtils.del(AppContants.APP_LOGIN_PREFIX + id); - return new FebsResponse().success().message("退出登录"); + return new FebsResponse().success().message("操作成功"); } @Override public FebsResponse findMemberInfo() { Long id = LoginUserUtil.getLoginUser().getId(); - MallMember mallMember = this.baseMapper.selectById(id); - - MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember); - - MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId()); - if (referMember != null) { - mallMemberVo.setReferrerName(referMember.getName()); - } - - if (StrUtil.isNotBlank(mallMember.getTradePassword())) { - mallMemberVo.setHasTradePwd(1); - } - - MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id); - if (payment != null) { - mallMemberVo.setHasPayment(1); - } - - DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel()); - if (dic != null) { - mallMemberVo.setLevelName(dic.getDescription()); - } - MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId()); + MallMember loginUser = LoginUserUtil.getLoginUser(); +// MallMember mallMember = this.baseMapper.selectById(id); + MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(loginUser); + MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id); mallMemberVo.setBalance(wallet.getBalance()); return new FebsResponse().success().data(mallMemberVo); } @@ -297,20 +241,18 @@ MallMember mallMember = this.baseMapper.selectById(memberId); List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId()); - BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId()); - TeamListVo own = new TeamListVo(); - own.setCreatedTime(mallMember.getCreatedTime()); - own.setAmount(ownAmount); - own.setName(mallMember.getName()); - own.setPhone(mallMember.getPhone()); - own.setInviteId(mallMember.getInviteId()); - own.setIsCurrent(1); - own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId())); - own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId())); - own.setId(mallMember.getId()); - list.add(0, own); - return new FebsResponse().success().data(list); + MyTeamVo myTeamVo = new MyTeamVo(); + myTeamVo.setTeam(list); + myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1)); + myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2)); + myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size()); + return new FebsResponse().success().data(myTeamVo); + } + + @Override + public MyTeamVo teamListForMine(TeamListDto teamListDto) { + return null; } @Override @@ -323,7 +265,7 @@ } @Override - public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status) { + public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status, Integer flowType) { MallMoneyFlow flow = new MallMoneyFlow(); flow.setMemberId(memberId); flow.setAmount(amount); @@ -333,6 +275,7 @@ flow.setRemark(remark); flow.setRtMemberId(rtMemberId); flow.setStatus(status); + flow.setFlowType(flowType); mallMoneyFlowMapper.insert(flow); } @@ -342,6 +285,10 @@ MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount()); if (mallMember == null) { throw new FebsException("用户不存在"); + } + Integer insideWith = mallMember.getInsideWith() == null ? 2 :mallMember.getInsideWith(); + if (1 != insideWith) { + throw new FebsException("功能升级中"); } Long memberId = LoginUserUtil.getLoginUser().getId(); @@ -359,49 +306,40 @@ throw new FebsException("支付密码错误"); } - walletService.reduceBalance(transferDto.getAmount(), memberId); + DataDictionaryCustom cashOutSettingDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.CASHOUT_SETTING.getType(), + DataDictionaryEnum.CASHOUT_SETTING.getCode() + ); + CashOutSettingVo cashOutSettingVo = JSONObject.parseObject(cashOutSettingDic.getValue(), CashOutSettingVo.class); + BigDecimal insideFee = cashOutSettingVo.getInsideFee().multiply(BigDecimal.valueOf(0.01)); + //转账手续费 + BigDecimal insideFeeAmount = transferDto.getAmount().multiply(insideFee).setScale(2, BigDecimal.ROUND_DOWN); + + BigDecimal avaAmount = transferDto.getAmount().subtract(insideFeeAmount).setScale(2, BigDecimal.ROUND_DOWN); + walletService.reduceBalance(avaAmount, memberId); String orderNo = MallUtils.getOrderNum("T"); - this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null); + this.addMoneyFlow( + memberId, + avaAmount.negate(), + MoneyFlowTypeEnum.TRANSFER.getValue(), + orderNo, + null, + null, + mallMember.getId(), + null, + FlowTypeEnum.BALANCE.getValue()); - walletService.addBalance(transferDto.getAmount(), mallMember.getId()); - this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null); - } - - @Override - public void withdrawal(WithdrawalDto withdrawalDto) { - Long memberId = LoginUserUtil.getLoginUser().getId(); - MallMember mallMember = this.baseMapper.selectById(memberId); - if (StrUtil.isBlank(mallMember.getTradePassword())) { - throw new FebsException("未设置支付密码"); - } - - if (!mallMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) { - throw new FebsException("支付密码错误"); - } - - if (withdrawalDto.getAmount().compareTo(BigDecimal.valueOf(100)) < 0) { - throw new FebsException("最小提现金额为100"); - } - - MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId); - if (payment == null) { - throw new FebsException("未设置收款方式"); - } - - BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId); - MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); - if (profit != null) { - // 可提现 - BigDecimal canMoney = wallet.getBalance().subtract(profit); - - if(withdrawalDto.getAmount().compareTo(canMoney) > 0) { - throw new FebsException("提现金额不足"); - } - } - - walletService.reduceBalance(withdrawalDto.getAmount(), memberId); - String orderNo = MallUtils.getOrderNum("W"); - this.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1); + walletService.addBalance(avaAmount, mallMember.getId()); + this.addMoneyFlow( + mallMember.getId(), + avaAmount, + MoneyFlowTypeEnum.TRANSFER.getValue(), + orderNo, + null, + null, + memberId, + null, + FlowTypeEnum.BALANCE.getValue()); } @Override @@ -442,14 +380,188 @@ public BigDecimal canMoney() { Long memberId = LoginUserUtil.getLoginUser().getId(); MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); - BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId); - BigDecimal canMoney = wallet.getBalance(); - if (profit != null) { - if(canMoney.compareTo(BigDecimal.ZERO) > 0) { - canMoney = canMoney.subtract(profit); + return canMoney; + } + + @Override + public List<MallMember> findRankList(RankListDto rankListDto) { + IPage<MallMember> page = new Page<>(rankListDto.getPageNum(), rankListDto.getPageSize()); + + MallMember member = new MallMember(); + member.setQuery("2"); + member.setCreatedTime(new Date()); + IPage<MallMember> list = this.baseMapper.selectRankListInPage(page, member); + + return list.getRecords(); + } + + @Override + public MallMember findMemberInfoByAccount(String phone) { + return this.baseMapper.selectInfoByAccount(phone); + } + + @Override + public MyCommissionVo myCommission() { + Long id = LoginUserUtil.getLoginUser().getId(); + MallMember mallMember = this.baseMapper.selectById(id); + + MyCommissionVo commissionVo = MallMemberConversion.INSTANCE.entityToCommissionVo(mallMember); + + MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId()); + if (referMember != null) { + commissionVo.setReferrerName(referMember.getName()); + commissionVo.setAvatar(referMember.getAvatar()); + } + + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel()); + if (dic != null) { + commissionVo.setLevelName(dic.getDescription()); + } + + MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id); + commissionVo.setCommission(wallet.getBalance()); + commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id)); + commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id)); + commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id)); + commissionVo.setWaitCommission(BigDecimal.ZERO); + return commissionVo; + } + + @Override + public void shopApply(ShopApplyDto shopApplyDto) { + MallMember member = LoginUserUtil.getLoginUser(); + + MallShopApply hasApply = mallShopApplyMapper.selectNewestApplyByMemberId(member.getId()); + if (hasApply != null) { + if (!hasApply.getStatus().equals(MallShopApply.APPLY_DISAGREE)) { + throw new FebsException("请勿重复提交申请"); } } - return canMoney; + + MallShopApply mallShopApply = new MallShopApply(); + BeanUtil.copyProperties(shopApplyDto, mallShopApply); + + mallShopApply.setStatus(MallShopApply.APPLY_ING); + mallShopApply.setMemberId(member.getId()); + mallShopApplyMapper.insert(mallShopApply); + } + + @Override + public MallShopApply findNewestApply() { + MallMember member = LoginUserUtil.getLoginUser(); + + return mallShopApplyMapper.selectNewestApplyByMemberId(member.getId()); + } + + @Override + public CashOutSettingVo cashOutSetting() { + CashOutSettingVo cashOutSettingVo = new CashOutSettingVo(); + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode()); + if (dic != null) { + cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class); + } + DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + GreenScoreEnum.VOUCHER_ON_OFF.getType(), GreenScoreEnum.VOUCHER_ON_OFF.getCode()); + if(ObjectUtil.isNotEmpty(voucherOnOffDic)){ + cashOutSettingVo.setVoucherOnOff(voucherOnOffDic.getValue()); + DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( + GreenScoreEnum.VOUCHER_PERCENT.getType(), GreenScoreEnum.VOUCHER_PERCENT.getCode()); + if(ObjectUtil.isNotEmpty(voucherPercentDic)){ + cashOutSettingVo.setVoucherPercent(new BigDecimal(voucherPercentDic.getValue())); + } + } + + return cashOutSettingVo; + } + + @Override + public List<ShopListVo> findShopListVo(ShopListDto shopListDto) { + Page<MallShopApply> page = new Page<>(shopListDto.getPageNow(), shopListDto.getPageSize()); + + MallShopApply shopApply = new MallShopApply(); + shopApply.setStatus(MallShopApply.APPLY_AGREE); + IPage<MallShopApply> pageResult = mallShopApplyMapper.selectShopApplyInPage(shopApply, page); + + List<MallShopApply> list = pageResult.getRecords(); + if (CollUtil.isEmpty(list)) { + list = new ArrayList<>(); + } + return MallShopApplyConversion.INSTANCE.entitiesToVOs(list); + } + + @Override + @Transactional + public FebsResponse addMemberBank(AddMemberBankDto addMemberBankDto) { + MallMember member = LoginUserUtil.getLoginUser(); + MallMemberBank mallMemberBank = MallMemberBankConversion.INSTANCE.dtoToentity(addMemberBankDto); + mallMemberBank.setMemberId(member.getId()); + mallMemberBankMapper.insert(mallMemberBank); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse findMemberBankList(MemberBankListDto memberBankListDto) { + MallMember member = LoginUserUtil.getLoginUser(); + Page<MemberBankListVo> page = new Page<>(memberBankListDto.getPageNum(), memberBankListDto.getPageSize()); + memberBankListDto.setMemberId(member.getId()); + IPage<MemberBankListVo> pageResult = mallMemberBankMapper.findMemberBankListInPage(memberBankListDto, page); + return new FebsResponse().success().data(pageResult); + } + + @Override + public FebsResponse findBankDetailsById(Long id) { + MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id); + MemberBankListVo memberBankListVo = MallMemberBankConversion.INSTANCE.entityToVo(mallMemberBank); + return new FebsResponse().success().data(memberBankListVo); + } + + @Override + @Transactional + public FebsResponse updateMemberBank(UpdateMemberBankDto updateMemberBankDto) { + Long id = updateMemberBankDto.getId(); + MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id); + mallMemberBank.setName(updateMemberBankDto.getName()); + mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum()); + mallMemberBank.setBankNo(updateMemberBankDto.getBankNo()); + mallMemberBank.setPhone(updateMemberBankDto.getPhone()); + mallMemberBankMapper.updateById(mallMemberBank); + return new FebsResponse().success(); + } + + @Override + @Transactional + public FebsResponse delMemberBank(Long id) { + mallMemberBankMapper.deleteById(id); + return new FebsResponse().success(); + } + + @Override + public FebsResponse findBankName() { + List<String> bankNameList = new ArrayList<>(); + List<DataDictionaryCustom> typeBank = dataDictionaryCustomMapper.selectDicByType("TYPE_BANK"); + if(CollUtil.isNotEmpty(typeBank)){ + bankNameList = typeBank.stream().map(DataDictionaryCustom::getValue).collect(Collectors.toList()); + } + return new FebsResponse().success().data(bankNameList); + } + + @Override + public FebsResponse pwdForget(ForgetPwdDto forgetPwdDto) { + MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount()); + if(ObjectUtil.isEmpty(mallMember)){ + throw new FebsException("账号不存在"); + } + + boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode()); + if (!b) { + throw new FebsException("验证码错误"); + } + + String pwd = SecureUtil.md5(forgetPwdDto.getPassword()); + mallMember.setPassword(pwd); + + this.baseMapper.updateById(mallMember); + return new FebsResponse().success().message("操作成功"); } } -- Gitblit v1.9.1