From 42f4246ff22f871b7cee15113cbe7523de8ab578 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 六月 2020 14:24:37 +0800
Subject: [PATCH] 优化创建物业功能
---
Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
index 9c89189..ecc526b 100644
--- a/Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
@@ -6,7 +6,15 @@
import com.java110.api.bmo.store.IStoreBMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.store.IStoreInnerServiceSMO;
+import com.java110.dto.store.StoreAttrDto;
import com.java110.dto.store.StoreDto;
+import com.java110.po.org.OrgPo;
+import com.java110.po.org.OrgStaffRelPo;
+import com.java110.po.store.StoreAttrPo;
+import com.java110.po.store.StoreCerdentialPo;
+import com.java110.po.store.StorePhotoPo;
+import com.java110.po.store.StorePo;
+import com.java110.po.store.StoreUserPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
@@ -63,9 +71,10 @@
businessStore.putAll(BeanConvertUtil.beanCovertMap(storeDtos.get(0)));
businessStore.putAll(paramInJson);
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessStore", businessStore);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(StorePo.class.getSimpleName(), businessStore);
return business;
}
+
/**
* 娣诲姞鍛樺伐
@@ -86,7 +95,7 @@
businessStoreUser.put("userId", paramInJson.getJSONObject("businessStore").getString("userId"));
businessStoreUser.put("relCd", StoreUserRelConstant.REL_ADMIN);
businessStoreUsers.add(businessStoreUser);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessStoreUser", businessStoreUsers);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(StoreUserPo.class.getSimpleName(), businessStoreUsers);
return business;
}
@@ -100,8 +109,8 @@
String storeId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_storeId);
paramObj.put("storeId", storeId);
- if (paramObj.containsKey("businessStore")) {
- JSONObject businessStoreObj = paramObj.getJSONObject("businessStore");
+ if (paramObj.containsKey(StorePo.class.getSimpleName())) {
+ JSONObject businessStoreObj = paramObj.getJSONObject(StorePo.class.getSimpleName());
businessStoreObj.put("storeId", storeId);
if (!businessStoreObj.containsKey("password")) {
String staffDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
@@ -118,8 +127,8 @@
}
}
- if (paramObj.containsKey("businessStoreAttr")) {
- JSONArray attrs = paramObj.getJSONArray("businessStoreAttr");
+ if (paramObj.containsKey(StoreAttrPo.class.getSimpleName())) {
+ JSONArray attrs = paramObj.getJSONArray(StoreAttrPo.class.getSimpleName());
for (int businessStoreAttrIndex = 0; businessStoreAttrIndex < attrs.size(); businessStoreAttrIndex++) {
JSONObject attr = attrs.getJSONObject(businessStoreAttrIndex);
@@ -128,8 +137,8 @@
}
}
- if (paramObj.containsKey("businessStorePhoto")) {
- JSONArray photos = paramObj.getJSONArray("businessStorePhoto");
+ if (paramObj.containsKey(StorePhotoPo.class.getSimpleName())) {
+ JSONArray photos = paramObj.getJSONArray(StorePhotoPo.class.getSimpleName());
for (int businessStorePhotoIndex = 0; businessStorePhotoIndex < photos.size(); businessStorePhotoIndex++) {
JSONObject attr = photos.getJSONObject(businessStorePhotoIndex);
@@ -138,8 +147,8 @@
}
}
- if (paramObj.containsKey("businessStoreCerdentials")) {
- JSONArray cerdentials = paramObj.getJSONArray("businessStoreCerdentials");
+ if (paramObj.containsKey(StoreCerdentialPo.class.getSimpleName())) {
+ JSONArray cerdentials = paramObj.getJSONArray(StoreCerdentialPo.class.getSimpleName());
for (int businessStoreCerdentialsIndex = 0; businessStoreCerdentialsIndex < cerdentials.size(); businessStoreCerdentialsIndex++) {
JSONObject attr = cerdentials.getJSONObject(businessStoreCerdentialsIndex);
@@ -174,7 +183,7 @@
businessOrg.put("allowOperation", "F");
businessOrg.put("storeId", paramInJson.getString("storeId"));
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOrg", businessOrg);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OrgPo.class.getSimpleName(), businessOrg);
return business;
}
@@ -201,7 +210,7 @@
businessOrg.put("allowOperation", "F");
businessOrg.put("storeId", paramInJson.getString("storeId"));
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOrg", businessOrg);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OrgPo.class.getSimpleName(), businessOrg);
return business;
}
@@ -228,7 +237,7 @@
businessOrg.put("storeId", paramInJson.getString("storeId"));
businessOrg.put("allowOperation", "F");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOrg", businessOrg);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OrgPo.class.getSimpleName(), businessOrg);
return business;
}
@@ -247,7 +256,7 @@
businessOrgStaffRel.put("orgId", paramInJson.getString("levelThreeOrgId"));
businessOrgStaffRel.put("relCd", StoreUserRelConstant.REL_ADMIN);
businessOrgStaffRels.add(businessOrgStaffRel);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOrgStaffRel", businessOrgStaffRels);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OrgStaffRelPo.class.getSimpleName(), businessOrgStaffRels);
return business;
}
--
Gitblit v1.8.0