From b722537de03af08b60ad269d67bd57ccb5e4d22c Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 10 Feb 2025 11:41:50 +0800 Subject: [PATCH] feat(pay): 添加 FIUU充值功能并优化支付流程 - 新增 FIUU 充值接口和相关请求模型 - 更新 FIUU 支付流程,支持订单和充值操作 - 优化 FIUU 回调处理,增加对充值订单的支持 - 调整订单状态更新逻辑,确保支付成功后正确更新 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 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 eb90623..7a6403a 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 @@ -252,7 +252,7 @@ public FebsResponse logout() { Long id = LoginUserUtil.getLoginUser().getId(); - String redisKey = AppContants.XCX_LOGIN_PREFIX + id; + String redisKey = AppContants.APP_LOGIN_PREFIX + id; String existToken = redisUtils.getString(redisKey); if (StrUtil.isNotBlank(existToken)) { Object o = redisUtils.get(existToken); @@ -260,7 +260,7 @@ redisUtils.del(existToken); } } - redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id); + redisUtils.del(AppContants.APP_LOGIN_PREFIX + id); redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id); return new FebsResponse().success().message("退出登录"); } @@ -353,8 +353,8 @@ @Override public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) { - MallMember member = LoginUserUtil.getLoginUser(); - MallMember mallMember = this.baseMapper.selectById(member.getId()); + Long memberId = LoginUserUtil.getLoginUser().getId(); + MallMember mallMember = this.baseMapper.selectById(memberId); if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) { mallMember.setName(modifyMemberInfoDto.getName()); } @@ -362,6 +362,11 @@ if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) { mallMember.setAvatar(modifyMemberInfoDto.getPhoto()); } + + mallMember.setSex(modifyMemberInfoDto.getSex()); + mallMember.setBirthday(DateUtil.parseDate(modifyMemberInfoDto.getBirthday())); + mallMember.setRealName(modifyMemberInfoDto.getRealName()); + mallMember.setEmail(modifyMemberInfoDto.getMailAddress()); this.baseMapper.updateById(mallMember); return new FebsResponse().success().message("修改成功"); @@ -1103,10 +1108,7 @@ MallMember member = this.baseMapper.selectById(loginUser.getId()); - MallMember mallMember = new MallMember(); - mallMember.setId(member.getId()); - mallMember.setLastLoginTime(new Date()); - this.baseMapper.updateById(mallMember); + this.baseMapper.updateLastLogin(member.getId(),new Date()); DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode()); if (dic == null || StrUtil.isBlank(dic.getValue())) { -- Gitblit v1.9.1