From e72b661ed7fe5a15f2d43220050ecbfab21200ab Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Fri, 15 Nov 2024 14:18:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug=20feat=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=E7=9A=84=E6=97=B6=E5=80=99=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=BB=88=E7=AB=AF=E4=B8=BA2=20feat=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96openid=20=E7=9A=84=E6=97=B6=E5=80=99=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mdd/front/controller/LoginController.java | 6 +++---
 .../main/java/com/mdd/front/controller/PayController.java   | 4 ++--
 .../java/com/mdd/front/service/impl/LoginServiceImpl.java   | 2 +-
 3 files changed, 6 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 82f1adb1..b75c7252 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
@@ -91,9 +91,9 @@ public class LoginController {
     public AjaxResult<LoginTokenVo> oaLogin(@Validated @RequestBody LoginCodeValidate loginCodeValidate) {
         Integer terminal = ClientEnum.OA.getCode();
         String code = loginCodeValidate.getCode();
-        if (StringUtils.isNull(loginCodeValidate.getTerminal())) {
-            terminal = LikeFrontThreadLocal.getTerminal();
-        }
+//        if (StringUtils.isNull(loginCodeValidate.getTerminal())) {
+//            terminal = LikeFrontThreadLocal.getTerminal();
+//        }
         LoginTokenVo vo = iLoginService.officeLogin(code, terminal);
         return AjaxResult.success(vo);
     }
diff --git a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java
index 8ab6a833..4bc92f64 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java
@@ -52,8 +52,8 @@ public class PayController {
     @GetMapping("/payStatus")
     @ApiOperation(("支付状态"))
     public AjaxResult<PayStatusVo> payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from,
-                                             @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) {
-        PayStatusVo vo = iPayService.payStatus(from, orderId);
+                                             @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer order_id) {
+        PayStatusVo vo = iPayService.payStatus(from, order_id);
         return AjaxResult.success(vo);
     }
 
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 2416a4ec..b3ebeb40 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
@@ -420,7 +420,7 @@ public class LoginServiceImpl implements ILoginService {
         UserAuth auth = userAuthMapper.selectOne(
                 new QueryWrapper<UserAuth>()
                         .eq("openid", openId)
-                        .eq("terminal", terminal)
+                        //.eq("terminal", terminal)
                         .last("limit 1"));
 
         // 创建授权