From 796c930558ee25b165a494783afaf5ab147803e3 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 17:48:40 +0800
Subject: [PATCH] 优化撤回小区审核功能
---
WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java b/WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java
index 6a561ef..e9a9537 100644
--- a/WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java
@@ -1,14 +1,18 @@
package com.java110.web.smo.community.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.StoreTypeConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
import com.java110.web.smo.community.IEditCommunitySMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -29,10 +33,9 @@
//super.validatePageInfo(pd);
Assert.hasKeyAndValue(paramIn, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(paramIn, "name", "蹇呭～锛岃濉啓灏忓尯鍚嶇О");
-Assert.hasKeyAndValue(paramIn, "address", "蹇呭～锛岃濉啓灏忓尯鍦板潃");
-Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "蹇呭～锛岃濉啓灏忓尯闄勮繎鍦版爣");
-
+ Assert.hasKeyAndValue(paramIn, "name", "蹇呭～锛岃濉啓灏忓尯鍚嶇О");
+ Assert.hasKeyAndValue(paramIn, "address", "蹇呭～锛岃濉啓灏忓尯鍦板潃");
+ Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "蹇呭～锛岃濉啓灏忓尯闄勮繎鍦版爣");
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
@@ -42,8 +45,22 @@
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ResponseEntity<String> responseEntity = null;
- super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ //super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
+ responseEntity = getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, responseEntity.getBody() + "");
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+
+ if(!StoreTypeConstant.STORE_TYPE_SYSTEM_MANAGER.equals(storeTypeCd)){
+ super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ }
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/community.updateCommunity",
HttpMethod.POST);
--
Gitblit v1.8.0