From 7f3ec09ce18437dbf1d2667af79d3471aba270df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 25 Sep 2024 16:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/LoginContoller.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
index 680fa69..55dc30d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -179,17 +179,12 @@ public class LoginContoller {
 //    }
     @RequestMapping("getPhoneNumber")
     public Result getPhoneNumber(@RequestHeader String openId, @RequestBody Map<String, String> map) {
-
-        if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
-            Result.fail("code不能为空");
-        }
-
+        String encryptedData = map.get("encryptedData");
         // 三方登录来源 wechat、alipay
         String source = map.getOrDefault("source",AuthSource.WECHAT.getValue());
-        String code = map.get("code");
         if (AuthSource.ALIPAY.getValue().equals(source)) {
             try {
-                String mobile = alipayUtil.getMobile(code);
+                String mobile = alipayUtil.getMobile(encryptedData);
                 return Result.success(CodeEnum.SUCCESS, mobile);
             }catch (AlipayApiException e){
                 log.error("获取手机号失败：",e);
@@ -200,7 +195,11 @@ public class LoginContoller {
                 return Result.fail("获取手机号失败：未知错误");
             }
         }
-        String encryptedData = map.get("encryptedData");
+        if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
+            Result.fail("code不能为空");
+        }
+        String code = map.get("code");
+
 
         String ivStr = map.get("iv");
         if (StringUtils.isBlank(encryptedData) || StringUtils.isBlank(ivStr)) {