From d1ec7cf0d4445e3a680534a29261d792d434aaee Mon Sep 17 00:00:00 2001
From: feijinping <feijinping@foxmail.com>
Date: Tue, 28 Feb 2023 20:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E9=99=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cyl/h5/controller/WechatController.java  | 3 ++-
 .../src/main/java/com/cyl/ums/service/MemberWechatService.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java
index 3827466..6b9e70a 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java
@@ -38,6 +38,7 @@ public class WechatController {
      */
     @PostMapping("/no-auth/wechat/h5-login")
     public ResponseEntity<String> h5Login(@RequestBody WechatLoginForm form) {
-        return ResponseEntity.ok(memberWechatService.login(form));
+        String token = memberWechatService.login(form);
+        return ResponseEntity.ok("{\"data\": \"" + token + "\"}");
     }
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java
index b6d7289..b51a33b 100644
--- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java
@@ -189,6 +189,7 @@ public class MemberWechatService {
                 if (StrUtil.isNotEmpty(info.getHeadimgurl())) {
                     update.setAvatar(info.getHeadimgurl());
                 }
+                update.setUserId(m.getMemberId());
                 sysUserMapper.updateUser(update);
             }
             u = sysUserMapper.selectUserById(m.getMemberId());