From 4a5f5d15eabe4a7e8e77293dc3bb42f1d125968b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 18 四月 2019 11:28:07 +0800
Subject: [PATCH] 入驻小区
---
WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java
index cbbb738..3b87a47 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java
@@ -19,6 +19,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import org.thymeleaf.util.StringUtils;
/**
* 灏忓尯鏈嶅姟绫�
@@ -82,12 +83,20 @@
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
-
+ String communityName = !_paramObj.containsKey("communityName")?"":_paramObj.getString("communityName");
//淇敼鐢ㄦ埛淇℃伅
- responseEntity = this.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.noEnterCommunity.byMember?memberId="+storeId+
- "&memberTypeCd="+MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE,storeTypeCd),
- HttpMethod.GET);
+ if(StringUtils.isEmpty(communityName)) {
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.noEnterCommunity.byMember?memberId=" + storeId +
+ "&memberTypeCd=" + MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE, storeTypeCd),
+ HttpMethod.GET);
+ }else{
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.noEnterCommunity.byMemberAndName?memberId=" + storeId +
+ "&memberTypeCd=" + MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE, storeTypeCd)
+ +"&name="+communityName,
+ HttpMethod.GET);
+ }
if(responseEntity.getStatusCode() != HttpStatus.OK){
return responseEntity;
@@ -101,6 +110,41 @@
}
+ /**
+ * 鍟嗘埛鍏ラ┗鐢宠鎺ュ彛
+ * @param pd
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> _saveEnterCommunity(IPageData pd) {
+
+ ResponseEntity<String> responseEntity = null;
+ Assert.jsonObjectHaveKey(pd.getReqData(),"communityId","璇锋眰淇℃伅涓湭鍖呭惈communityId");
+ JSONObject _paramObj = JSONObject.parseObject(pd.getReqData());
+
+ String communityId = _paramObj.getString("communityId");
+
+ //鏉冮檺鏍￠獙
+ checkUserHasPrivilege(pd,restTemplate, PrivilegeCodeConstant.PRIVILEGE_ENTER_COMMUNITY);
+ responseEntity = super.getStoreInfo(pd,restTemplate);
+ if(responseEntity.getStatusCode() != HttpStatus.OK){
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(),"storeId","鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ _paramObj.put("memberId",storeId);
+ _paramObj.put("memberTypeCd",MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE,storeTypeCd));
+
+ responseEntity = this.callCenterService(restTemplate, pd, _paramObj.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/member.join.community",
+ HttpMethod.POST);
+
+ return responseEntity;
+ }
+
+
private void freshCommunityAttr(JSONArray community){
for(int _communityIndex = 0 ;_communityIndex < community.size();_communityIndex++){
JSONObject _community = community.getJSONObject(_communityIndex);
--
Gitblit v1.8.0