From 25526c5fe2edd5a6133a239b490f9d03044e75cf Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 16:38:23 +0800
Subject: [PATCH] 骑手微信登录

---
 oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
index 67ef05d..c35e3d6 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -240,7 +240,7 @@
                 authUser.setUsername(userDto.getUsername());
                 break;
             case NEW:
-                jsonObject = weiXinService.getPhoneNumber(authUser.getCode());
+                jsonObject = weiXinService.getRiderPhoneNumber(authUser.getCode());
                 String phone = jsonObject.getJSONObject("phone_info").getString("purePhoneNumber");
                 User user1 = userService.findByName(phone);
                 if (user1 == null) {
@@ -248,22 +248,23 @@
                     User user = new User();
                     user.setUsername(phone);
                     user.setNickName("OYING-" + phone);
-                    user.setUserType(ConstantsKey.RIDER);
+                    user.setUserType(ConstantsKey.BUYER);
                     user.setPhone(phone);
                     user.setGender("男");
                     user.setEnabled(true);
                     getRole(user);
                     user.setPassword(passwordEncoder.encode(phone.substring(phone.length() - 6)));
-                    user.setOpenid(authUser.getUsername());
+                    user.setRiderOpenId(authUser.getUsername());
                     userService.create(user);
                 } else {
-                    if (user1.getUserType().equals(ConstantsKey.RIDER)) {
+                    if (user1.getUserType().equals(ConstantsKey.BUYER)) {
                         if (user1.getRoles() == null) {
                             getRole(user1);
                         }
                     }
-                    user1.setOpenid(authUser.getUsername());
-                    userService.update(user1);
+                    user1.setRiderOpenId(authUser.getUsername());
+                    // userService.update(user1);
+                    userService.updateRiderOpenId(user1);
                 }
                 authUser.setUsername(phone);
                 break;

--
Gitblit v1.9.3