From d2e42a5cb6d4dced71e4a8a17da92148c47f850d Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Sat, 9 Nov 2024 23:30:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E5=A4=B1=E6=95=88=E7=9A=84bug=20fix=20=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=80=E9=94=AE=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdd/front/controller/LoginController.java | 12 ++++++++++-
 .../front/service/impl/LoginServiceImpl.java  | 20 ++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java
index d36218d8..82f1adb1 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java
@@ -77,7 +77,7 @@ public class LoginController {
     @PostMapping("/mnpLogin")
     @ApiOperation(value="微信登录")
     public AjaxResult<LoginTokenVo> mnpLogin(@Validated @RequestBody LoginCodeValidate loginCodeValidate) {
-        Integer terminal = LikeFrontThreadLocal.getTerminal();
+        Integer terminal = ClientEnum.MNP.getCode();
 
         String code = loginCodeValidate.getCode();
 
@@ -145,4 +145,14 @@ public class LoginController {
         iUserService.bindOa(BindOaValidate, userId);
         return AjaxResult.success();
     }
+
+
+    @PostMapping("/mnpAuthBind")
+    @ApiOperation(value="绑定小程序")
+    public AjaxResult<Object> mnpAuthBind(@Validated @RequestBody UserBindWechatValidate BindOaValidate) {
+        Integer userId = LikeFrontThreadLocal.getUserId();
+        iUserService.bindMnp(BindOaValidate, userId);
+        return AjaxResult.success();
+    }
+
 }
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
index 67bd7b4e..fcc1095a 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
@@ -347,11 +347,21 @@ public class LoginServiceImpl implements ILoginService {
      */
     private LoginTokenVo __wxLoginHandle(String openId, String unionId, String avatar, String nickname, Integer terminal) {
         // 查询授权
-        UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper<UserAuth>()
-                .nested(wq->wq
-                    .eq("unionid", unionId).or()
-                    .eq("openid", openId)
-                ).last("limit 1"));
+        QueryWrapper queryWrapper = new QueryWrapper<UserAuth>();
+
+        if (StringUtils.equals(unionId, "0") == false) {
+            queryWrapper = new QueryWrapper<UserAuth>()
+                    .nested(wq->wq
+                            .eq("unionid", unionId).or()
+                            .eq("openid", openId)
+                    ).last("limit 1");
+        } else {
+            queryWrapper = new QueryWrapper<UserAuth>()
+                    .nested(wq->wq
+                            .eq("openid", openId)
+                    ).last("limit 1");
+        }
+        UserAuth userAuth = userAuthMapper.selectOne(queryWrapper);
 
         // 查询用户
         User user = null;