From 648bd9334ddf543f406cd5f91e588b42b2d178bd Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 22 六月 2024 16:00:07 +0800
Subject: [PATCH] 用户端 商品

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index f7481de..7a0e9a8 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -179,7 +179,11 @@
                         appMiniLoginVo.setZfbuserid(response.getOpenId());
                         appMiniLoginVo.setSysUser(sysUser);
                         appMiniLoginVo.setMemberid(member.getId());
-                        redisService.setCacheObject(SecurityConstant.SESSION_KEY + response.getUserId(), null, 1L, TimeUnit.DAYS);
+                        Member byId = this.getById(member.getId());
+                        if (appMiniLoginDto.getPhone()!=null){
+                            byId.setPhone(appMiniLoginDto.getPhone());
+                            this.updateById(byId);
+                        }
                     }else{
                         //创建新用户
                         String memberId = IdUtils.simpleUUID();
@@ -199,6 +203,7 @@
                         member.setUserId(sysUser.getUserId());
                         member.setDelFlag(0);
                         member.setNickname("白酒用户");
+                        member.setPhone(appMiniLoginDto.getPhone());
                         member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                         member.setZfbOpenid(response.getOpenId());
                         this.save(member);
@@ -258,6 +263,7 @@
                         member.setNickname("白酒用户");
                         member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                         member.setWxUnionid(unionid);
+                        member.setPhone(appMiniLoginDto.getPhone());
                         member.setMiniOpenid(openid);
                         this.save(member);
                     appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
@@ -270,11 +276,13 @@
                     appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                     appMiniLoginVo.setSysUser(sysUser);
                     appMiniLoginVo.setMemberid(member.getId());
+                    Member byId = this.getById(member.getId());
+                    if (appMiniLoginDto.getPhone()!=null){
+                        byId.setPhone(appMiniLoginDto.getPhone());
+                        this.updateById(byId);
                     }
 
-
-
-                redisService.setCacheObject(SecurityConstant.SESSION_KEY + openid, sessionKey, 1L, TimeUnit.DAYS);
+                }
             }
         }
 
@@ -288,6 +296,7 @@
     public Member getMembeid(MemberDTO memberDTO) {
         return  this.getById(memberDTO.getMemberid());
     }
+
 
     @Override
     public void updateMembeid(MemberDTO memberDTO) {
@@ -432,7 +441,7 @@
                 String plainData = null;
                 if (isDataEncrypted) {
                     try {
-                        plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset);
+                        plainData = AlipayEncrypt.decryptContent(content, encryptType, "XABBSOeWDakvuG9TDez4Qg====", charset);
                     } catch (AlipayApiException e) {
                         //解密异常, 记录日志
                         e.getMessage();
@@ -510,6 +519,7 @@
                 .like(StringUtils.isNotBlank(query.getRealName()), Member::getRealName,
                         query.getRealName())
                 .like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
+                .orderByDesc(Member::getCreateTime)
                 .page(new Page<>(query.getPageCurr(), query.getPageSize()));
         if (StringUtils.isEmpty(page.getRecords())) {
             return PageDTO.empty(page.getTotal(), page.getPages());

--
Gitblit v1.7.1