From 3fbdd17668bc5b22b49d094195995214d9478c17 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 二月 2023 17:02:47 +0800
Subject: [PATCH] modify purchase
---
service-store/src/main/java/com/java110/store/cmd/store/PropertySaveStoreAndShopCmd.java | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 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 6ee6c20..4827cb1 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,6 +8,7 @@
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;
@@ -16,6 +17,8 @@
import com.java110.intf.acct.IAccountBondObjInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
+import com.java110.intf.mall.IShopCommunityInnerServiceSMO;
+import com.java110.intf.mall.IShopInnerServiceSMO;
import com.java110.intf.store.*;
import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
@@ -24,13 +27,11 @@
import com.java110.po.org.OrgPo;
import com.java110.po.org.OrgStaffRelPo;
import com.java110.po.privilegeUser.PrivilegeUserPo;
-import com.java110.po.shop.ShopPo;
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.user.UserPo;
-import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.StoreUserRelConstant;
@@ -39,10 +40,38 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
+
+
+@Java110CmdDoc(title = "鐗╀笟鍏徃娣诲姞鍟嗘埛鍜屽晢閾哄姛鑳�",
+ description = "姝ゆ帴鍙ｇ洰鍓嶄富瑕佽鍒掔敤浜庡仠杞﹀嵎鐩稿叧浣跨敤",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/store.propertySaveStoreAndShop",
+ resource = "storeDoc",
+ author = "鍚村鏂�",
+ serviceCode = "store.propertySaveStoreAndShop"
+)
+
+@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':'鎴愬姛'}"
+)
/**
* 鐗╀笟鍏徃娣诲姞 鍟嗘埛鍜屽晢閾哄姛鑳�
@@ -75,7 +104,7 @@
private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
@Autowired
- private IStoreShopV1InnerServiceSMO shopInnerServiceSMOImpl;
+ private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
@Autowired
private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
@@ -88,6 +117,13 @@
@Autowired
private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+
+
+ @Autowired(required = false)
+ private IShopInnerServiceSMO shopInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private IShopCommunityInnerServiceSMO shopCommunityInnerServiceSMOImpl;
@Override
@@ -107,9 +143,9 @@
communityDto.setCommunityId(reqJson.getString("communityId"));
List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos,"灏忓尯涓嶅瓨鍦�");
- reqJson.put("communityName",communityDtos.get(0).getName());
- reqJson.put("areaCode",communityDtos.get(0).getAreaCode());
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦�");
+ reqJson.put("communityName", communityDtos.get(0).getName());
+ reqJson.put("areaCode", communityDtos.get(0).getCityCode());
StoreDto storeDto = new StoreDto();
storeDto.setTel(reqJson.getString("link"));
@@ -234,6 +270,7 @@
privilegeUserPo.setStoreId(storePo.getStoreId());
privilegeUserPo.setUserId(userPo.getUserId());
privilegeUserPo.setpId(defaultPrivilege);
+ privilegeUserPo.setPuId(GenerateCodeFactory.getGeneratorId("10"));
flag = privilegeUserV1InnerServiceSMOImpl.savePrivilegeUser(privilegeUserPo);
if (flag < 1) {
@@ -264,9 +301,13 @@
storeShopCommunityPo.setShopId(reqJson.getString("shopId"));
storeShopCommunityPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
storeShopCommunityPo.setState(StoreShopCommunityDto.STATE_SUCCESS);
- int flag = storeShopCommunityV1InnerServiceSMOImpl.saveStoreShopCommunity(storeShopCommunityPo);
-
- if(flag < 1){
+ int flag = 0;
+ if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+ flag = shopCommunityInnerServiceSMOImpl.saveShopCommunity(storeShopCommunityPo);
+ } else {
+ flag = storeShopCommunityV1InnerServiceSMOImpl.saveStoreShopCommunity(storeShopCommunityPo);
+ }
+ if (flag < 1) {
throw new IllegalArgumentException("灏忓尯鍏宠仈鍟嗛摵澶辫触");
}
}
@@ -313,7 +354,12 @@
shopPo.setState(ShopDto.STATE_Y);
//shopPo.setState(ShopDto.STATE_B);
- int flag = shopInnerServiceSMOImpl.saveStoreShop(shopPo);
+ int flag = 0;
+ if ("ON".equals(MappingCache.getValue("HAS_HC_MALL"))) {
+ flag = shopInnerServiceSMOImpl.saveShop(shopPo);
+ } else {
+ flag = storeShopV1InnerServiceSMOImpl.saveStoreShop(shopPo);
+ }
if (flag < 1) {
throw new CmdException("淇濆瓨鍟嗛摵澶辫触");
}
--
Gitblit v1.8.0