From 777e17ec99b7bfb1c2f0ef43bea4432149a1ae17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 1 Mar 2025 15:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=BA=97=E9=93=BA=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java  | 7 +++++--
 .../service/account/service/impl/ShopInfoServiceImpl.java  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java
index 86d2f7a9a..168154793 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoAddDTO.java
@@ -20,7 +20,7 @@ public class ShopInfoAddDTO {
     private String frontImg;
     @NotEmpty(message = "试用/正式不为空")
     private String profiles;
-    @NotEmpty(message = "激活码不为空")
+//    @NotEmpty(message = "激活码不为空")
     private String activateCode;
     @NotEmpty(message = "登录账号不为空")
     private String accountName;
@@ -35,7 +35,6 @@ public class ShopInfoAddDTO {
 //    @NotNull(message = "角色id不为空")
     // todo 默认为管理员角色，后期调整
     private Long roleId = 1L;
-    private String address;
     private String phone;
     /**
      * 店铺注册类型
@@ -43,4 +42,8 @@ public class ShopInfoAddDTO {
      * 后付 after
      */
     private String registerType;
+    private String cities;
+    private String districts;
+    private String provinces;
+    private String address;
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
index d6d742aa7..eec16870e 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -105,7 +105,9 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         shopInfo.setStatus(1);
         shopInfo.setProfiles("release");
         save(shopInfo);
-        activateShop(shopInfo, shopInfoAddDTO.getActivateCode());
+        if (StrUtil.isNotBlank(shopInfoAddDTO.getActivateCode())) {
+            activateShop(shopInfo, shopInfoAddDTO.getActivateCode());
+        }
         return updateById(shopInfo);
     }