From cd51c3f662088e8021fb575f1aa5755dc4707efc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 09 Jan 2025 14:54:14 +0800
Subject: [PATCH] refactor(mall): 优化会员信息修改逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   22 ++++++++++++++--------
 1 files changed, 14 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 c05d2d5..9065d54 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
@@ -130,8 +130,8 @@
         //对于邀请码的验证和上级联系人的验证
         Integer count = this.baseMapper.selectCount(null);
         if (count != null && count != 0) {
-            String inviteId = registerDto.getInviteId();
-            if(StrUtil.isNotBlank(inviteId)){
+            if(!StrUtil.isEmpty(registerDto.getInviteId())){
+                String inviteId = registerDto.getInviteId();
                 MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
                 if (inviteMember == null) {
                     throw new FebsException("邀请码不存在");
@@ -175,6 +175,12 @@
 
         if (StrUtil.isNotBlank(ids)) {
             mallMember.setReferrerIds(ids);
+        }
+        //会员VIP等级
+        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
+        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
+            MallVipConfig mallVipConfig = configs.get(0);
+            mallMember.setLevel(mallVipConfig.getCode());
         }
         this.baseMapper.updateById(mallMember);
 
@@ -246,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);
@@ -254,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("退出登录");
     }
@@ -356,6 +362,9 @@
         if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
             mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
         }
+
+        mallMember.setSex(modifyMemberInfoDto.getSex());
+        mallMember.setBirthday(modifyMemberInfoDto.getBirthday());
 
         this.baseMapper.updateById(mallMember);
         return new FebsResponse().success().message("修改成功");
@@ -1097,10 +1106,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