From b4492a199a06a9c0c4513a86f10a2ad3736c60bf Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Wed, 20 Dec 2023 18:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9B=B4=E6=96=B0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nakadai/mapper/PlatformTeamAccountMapper.java |  2 ++
 .../mapper/xml/PlatformTeamAccountMapper.xml      |  5 +++++
 .../impl/PlatformTeamAccountServiceImpl.java      | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nakadai/src/main/java/com/huoran/nakadai/mapper/PlatformTeamAccountMapper.java b/nakadai/src/main/java/com/huoran/nakadai/mapper/PlatformTeamAccountMapper.java
index a98a628..d67d9ba 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/mapper/PlatformTeamAccountMapper.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/mapper/PlatformTeamAccountMapper.java
@@ -41,4 +41,6 @@ public interface PlatformTeamAccountMapper extends BaseMapper<PlatformTeamAccoun
     void updateUserInfo(@Param("userId")Integer userId);
 
     void updateAccountOpenId(@Param("openid")String openid,@Param("accountId")Integer accountId);
+
+    void updateAccountPhone(@Param("phone")String phone, @Param("accountId")Integer accountId);
 }
diff --git a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamAccountMapper.xml b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamAccountMapper.xml
index 7eefe9f..acba710 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamAccountMapper.xml
+++ b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamAccountMapper.xml
@@ -11,6 +11,11 @@
         SET app_open_id = #{openid}
         WHERE id = #{accountId}
     </update>
+    <update id="updateAccountPhone">
+        UPDATE hr_user_account
+        SET phone = #{phone}
+        WHERE id = #{accountId}
+    </update>
 
     <select id="platformTeamAccountMergeList"
             resultType="com.huoran.nakadai.entity.res.PlatformTeamAccountResp">
diff --git a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
index 0fb0d8c..2ad2f69 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
@@ -108,6 +108,10 @@ public class PlatformTeamAccountServiceImpl extends ServiceImpl<PlatformTeamAcco
                 if (!userAccount.getIsEnable()){
                     throw new CustomException(ExceptionEnum.ACCOUNT_DISABLED);
                 }
+                if (userAccount.getPhone()== null){
+                    //登录更新手机号
+                    baseMapper.updateAccountPhone(appletCallbackReq.getPhone(),userAccount.getId());
+                }
                 //更新登录时间
                 baseMapper.updateUserInfo(userAccount.getUserId());
                 data.put("state", "login");
@@ -151,11 +155,16 @@ public class PlatformTeamAccountServiceImpl extends ServiceImpl<PlatformTeamAcco
     @Override
     public R kindergartenWeChatApplication(AppletCallbackReq appletCallbackReq) {
         UserAccount userAccount = baseMapper.selectAccountByOpenId(appletCallbackReq.getOpenId(), appletCallbackReq.getPlatformId());
-        //根据手机号查询用户
-        UserAccount userAccountByPhone = baseMapper.selectAccount(appletCallbackReq.getPhone(),appletCallbackReq.getPlatformId().toString());
-        if (userAccount != null || userAccountByPhone!= null){
+        if (userAccount != null){
             return R.error("该用户已存在");
         }
+        if (appletCallbackReq.getPhone()!= null){
+            UserAccount userAccountByPhone = baseMapper.selectAccount(appletCallbackReq.getPhone(),appletCallbackReq.getPlatformId().toString());
+            //根据手机号查询用户
+            if (userAccountByPhone != null){
+                return R.error("该用户已存在");
+            }
+        }
 
         Map<String, Object> data = new HashedMap<String, Object>();
         String randomNumbers = cn.hutool.core.util.RandomUtil.randomNumbers(6);