From a94c9a85c70b60e93d0274df3089c3bf8809daf5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 十一月 2025 18:45:48 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 8b45da5..686a8b3 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -702,24 +702,18 @@
             onconUUID = UserUtil.getOnconUUIDByMobile(phone);
         }
 
-        int i =0;
         if(null == userInfo){
             userInfo = new UserInfo();
             userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
-            if(ToolUtil.isEmpty(phone)){
+            if(ToolUtil.isNotEmpty(phone)){
                 List<UserInfo> phone1 = userInfoMapper.selectList(new EntityWrapper<UserInfo>().eq("phone", phone).eq("state",1).ne("flag",3));
                 if(phone1.size()>0){
                     userInfo = phone1.get(0);
                     userInfo.setUnionid(unionid);
                     userInfo.setAppletsOpenId(openid);
-                    userInfoMapper.updateById(userInfo);
-                    i=1;
-                }else {
-                    userInfo.setPhone(phone);
                 }
-            }else {
-                userInfo.setPhone(phone);
             }
+            userInfo.setPhone(phone);
 
             userInfo.setPassWord(ShiroKit.md5("", salt));
             userInfo.setRegistIp(registIp);
@@ -729,11 +723,11 @@
             userInfo.setAvatar(avatar);
             userInfo.setOnconUUID(onconUUID);
 
-           if(type == 2){
+            if(type == 2){
                userInfo.setAppletsOpenId(openid);
-           }else{
+            }else{
                userInfo.setOpenId(openid);
-           }
+            }
             userInfo.setUnionid(unionid);
             userInfo.setIsAuth(1);
             userInfo.setConsumption(0D);
@@ -747,7 +741,9 @@
             }else {
                 userInfo.setCompanyId(1);
             }
-            if(i==0){
+            if(null == userInfo.getId()){
+                userInfoMapper.updateById(userInfo);
+            }else{
                 this.insert(userInfo);
                 this.addCoupon(userInfo);//添加优惠券
                 UserInfo finalUserInfo = userInfo;

--
Gitblit v1.7.1