From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-core/src/main/java/com/java110/core/smo/impl/GetCommunityStoreInfoSMOImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/GetCommunityStoreInfoSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/GetCommunityStoreInfoSMOImpl.java
index 54ef60c..85e30be 100644
--- a/java110-core/src/main/java/com/java110/core/smo/impl/GetCommunityStoreInfoSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/GetCommunityStoreInfoSMOImpl.java
@@ -6,12 +6,10 @@
import com.java110.core.context.IPageData;
import com.java110.core.factory.CallApiServiceFactory;
import com.java110.core.smo.IGetCommunityStoreInfoSMO;
-import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.HttpMethod;
@@ -33,7 +31,9 @@
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
ResponseEntity<String> responseEntity = null;
responseEntity = CallApiServiceFactory.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/query.store.byuser?userId=" + userId, HttpMethod.GET);
-
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException(responseEntity.getBody());
+ }
return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
}
@@ -41,10 +41,17 @@
@Cacheable(value = "getStoreEnterCommunitys" + Java110RedisConfig.GET_STORE_ENTER_COMMUNITYS_EXPIRE_TIME_KEY, key = "#storeId")
public ResultVo getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
ResponseEntity<String> responseEntity = null;
+// responseEntity = CallApiServiceFactory.callCenterService(restTemplate, pd, "",
+// ServiceConstant.SERVICE_API_URL + "/api/query.myCommunity.byMember?memberId=" + storeId + "&memberTypeCd="
+// + MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE, storeTypeCd), HttpMethod.GET);
+
responseEntity = CallApiServiceFactory.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/query.myCommunity.byMember?memberId=" + storeId + "&memberTypeCd="
+ ServiceConstant.SERVICE_API_URL + "/api/communitys/queryStoreCommunitys?memberId=" + storeId + "&memberTypeCd="
+ MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE, storeTypeCd), HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException(responseEntity.getBody());
+ }
return new ResultVo(responseEntity.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, responseEntity.getBody());
}
@@ -54,7 +61,9 @@
ResponseEntity<String> privilegeGroup = CallApiServiceFactory.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + staffId + "&domain=" + storeTypeCd, HttpMethod.GET);
-
+ if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException(privilegeGroup.getBody());
+ }
return new ResultVo(privilegeGroup.getStatusCode() == HttpStatus.OK ? ResultVo.CODE_OK : ResultVo.CODE_ERROR, privilegeGroup.getBody());
}
@@ -67,7 +76,7 @@
HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
- return null;
+ throw new IllegalArgumentException(responseEntity.getBody());
}
JSONObject data = JSONObject.parseObject(responseEntity.getBody());
--
Gitblit v1.8.0