From 26a3aab8cbeece31392d8fa1d932a78e19f8c2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 17 Feb 2025 10:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/menu/MenuAddDTO.java     |  4 ++++
 .../java/com/czg/account/dto/menu/MenuEditDTO.java    |  4 ++++
 .../com/czg/account/dto/shopuser/ShopUserAddDTO.java  |  6 ------
 .../account/service/impl/ShopUserServiceImpl.java     | 11 +++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuAddDTO.java
index 5ec77a40..58c560e5 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuAddDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuAddDTO.java
@@ -44,6 +44,10 @@ public class MenuAddDTO {
      * 组件
      */
     private String component;
+    /**
+     * 组件名称
+     */
+    private String name;
     /**
      * 菜单排序
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuEditDTO.java
index e8e91757..41c9ae0c 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuEditDTO.java
@@ -38,6 +38,10 @@ public class MenuEditDTO {
      * 组件
      */
     private String component;
+    /**
+     * 组件名称
+     */
+    private String name;
     /**
      * 菜单排序
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java
index c8533cd2..b47d9c02 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java
@@ -39,12 +39,6 @@ public class ShopUserAddDTO {
      */
     private Integer sex;
 
-    /**
-     * 用户Id
-     */
-    @NotNull(message = "用户id不为空")
-    private Long userId;
-
     /**
      * 账户积分
      */
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
index 67779881..5be1ed76 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
@@ -109,12 +109,11 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
 
     @Override
     public Boolean add(Long shopId, ShopUserAddDTO shopUserAddDTO) {
-        long userCount = userInfoService.queryChain().eq(UserInfo::getId, shopUserAddDTO.getUserId()).count();
-        if (userCount == 0) {
-            throw new ApiNotPrintException("用户信息不存在");
-        }
-        long count = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, shopUserAddDTO.getUserId()).count();
-        if (count > 0) {
+        UserInfo userInfo = userInfoService.queryChain().eq(UserInfo::getPhone, shopUserAddDTO.getPhone()).one();
+        if (userInfo == null) {
+            userInfo = BeanUtil.copyProperties(shopUserAddDTO, UserInfo.class);
+            userInfoService.save(userInfo);
+        }else {
             throw new ApiNotPrintException("此用户已存在");
         }