From e42b95e556a36d8fd56a7acefbe767ed29a8caef Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Tue, 2 Sep 2025 22:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B9=9F=E6=8E=A8=E9=80=81id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ZcBaseUserController.java        |  4 +++-
 .../baseUser/service/IZcBaseUserService.java    |  1 +
 .../service/impl/ZcBaseUserServiceImpl.java     | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java
index d14e7e5..e2b27f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java
@@ -98,8 +98,10 @@ public class ZcBaseUserController extends BaseController
     {
         int flag = zcBaseUserService.insertZcBaseUser(zcBaseUser);
         if(flag > 0){
+            // 存在修改用户信息情况（门店用户场景）
+            ZcBaseUser baseUser = zcBaseUserService.selectZcBaseUserByPhone(zcBaseUser.getPhoneNumber());
             // 推送用户ID
-            dataPushApi.sendAddUser(zcBaseUser.getId());
+            dataPushApi.sendAddUser(baseUser.getId());
         }
         return toAjax(flag);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java
index 8adc7a4..418c079 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java
@@ -30,6 +30,7 @@ public interface IZcBaseUserService
 
     public List<ZcBaseUser> selectZcBaseUserByStoreId(Long storeId, Long operatorId);
 
+    public ZcBaseUser selectZcBaseUserByPhone(String phone);
     /**
      * 新增租车用户信息
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java
index e897007..f62b84e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java
@@ -57,6 +57,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
         return zcBaseUserMapper.selectZcBaseUserByStoreId(storeId,operatorId);
     }
 
+    @Override
+    public ZcBaseUser selectZcBaseUserByPhone(String phone) {
+        return zcBaseUserMapper.selectZcBaseUserByPhone(phone);
+    }
+
     /**
      * 新增租车用户信息
      * 
@@ -76,9 +81,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
             a.setIsStore(1L);
             a.setUpdateTime(DateUtils.getNowDate());
             int rows = zcBaseUserMapper.updateZcBaseUser(a);
-            // 然后绑定与门店的关联
-            oldUser.setZcBaseUserStoreList(zcBaseUser.getZcBaseUserStoreList());
-            insertZcBaseUserStore(oldUser);
+            if(rows > 0) {
+                // 然后绑定与门店的关联
+                oldUser.setZcBaseUserStoreList(zcBaseUser.getZcBaseUserStoreList());
+                insertZcBaseUserStore(oldUser);
+            }
             return rows;
         }else{
             String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword());
@@ -86,7 +93,9 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService
             zcBaseUser.setIsStore(1L);
             zcBaseUser.setCreateTime(DateUtils.getNowDate());
             int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser);
-            insertZcBaseUserStore(zcBaseUser);
+            if (rows > 0){
+                insertZcBaseUserStore(zcBaseUser);
+            }
             return rows;
         }
     }