From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java b/service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java
index 6eefada..e5c65ab 100644
--- a/service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java
@@ -8,11 +8,12 @@
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.dto.account.AccountDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.shop.ShopDto;
 import com.java110.dto.store.StoreDto;
-import com.java110.dto.storeShopCommunity.StoreShopCommunityDto;
+import com.java110.dto.shop.StoreShopCommunityDto;
 import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.community.ICommunityV1InnerServiceSMO;
@@ -25,11 +26,11 @@
 import com.java110.po.account.AccountPo;
 import com.java110.po.org.OrgPo;
 import com.java110.po.org.OrgStaffRelPo;
-import com.java110.po.privilegeUser.PrivilegeUserPo;
+import com.java110.po.privilege.PrivilegeUserPo;
 import com.java110.po.store.StorePo;
 import com.java110.po.store.StoreUserPo;
-import com.java110.po.storeShop.StoreShopPo;
-import com.java110.po.storeShopCommunity.StoreShopCommunityPo;
+import com.java110.po.shop.StoreShopPo;
+import com.java110.po.shop.StoreShopCommunityPo;
 import com.java110.po.user.UserPo;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
@@ -42,6 +43,36 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+
+
+@Java110CmdDoc(title = "鐗╀笟鍏徃娣诲姞鍟嗘埛鍜屽晢閾哄姛鑳�",
+        description = "姝ゆ帴鍙g洰鍓嶄富瑕佽鍒掔敤浜庡仠杞﹀嵎鐩稿叧浣跨敤",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/store.propertySaveStoreAndShop",
+        resource = "storeDoc",
+        author = "鍚村鏂�",
+        serviceCode = "store.propertySaveStoreAndShop",
+        seq = 5
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "shopName", length = 30, remark = "鍟嗛摵鍚嶇О 鍟嗗鍚嶇О鍜屽晢閾哄悕绉颁竴鑷达紝濡傛灉闇�姹傞渶瑕佷笉涓�鑷�"),
+        @Java110ParamDoc(name = "link", length = 30, remark = "绠$悊鍛樻墜鏈哄彿"),
+        @Java110ParamDoc(name = "password", length = 30, remark = "鐧诲綍瀵嗙爜"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"shopName\":\"娴嬭瘯鍟嗗\",\"link\":\"18909714444\",\"password\":\"123456\",\"communityId\":\"2022081539020475\"}",
+        resBody="{'code':0,'msg':'鎴愬姛'}"
+)
 
 /**
  * 鐗╀笟鍏徃娣诲姞 鍟嗘埛鍜屽晢閾哄姛鑳�
@@ -299,6 +330,7 @@
         accountPo.setAcctType(AccountDto.ACCT_TYPE_CASH);
         accountPo.setAcctName(storePo.getName());
         accountPo.setPartId(reqJson.getString("shopId"));
+        accountPo.setLink(reqJson.getString("link"));
         accountInnerServiceSMOImpl.saveAccount(accountPo);
     }
 

--
Gitblit v1.8.0