From f7e8929df659555758f2945cb35ab300f174d7a7 Mon Sep 17 00:00:00 2001
From: sangzhigang <sangzhigang@hongruiinfo.com>
Date: 星期四, 24 二月 2022 11:20:09 +0800
Subject: [PATCH] 优化仓库使用中的bug,优化页面展示问题
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
index 88b683c..1a34c9f 100644
--- a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
+++ b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
@@ -7,7 +7,9 @@
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.user.UserDto;
import com.java110.entity.component.ComponentValidateResult;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
@@ -19,7 +21,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -29,10 +33,10 @@
private static final Logger logger = LoggerFactory.getLogger(DefaultAbstractComponentSMO.class);
protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
- private static final String URL_API = "";
+ private static final String URL_API = "";
+
@Autowired
private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
-
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -42,6 +46,9 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
@@ -125,7 +132,7 @@
*
* @return
*/
- protected ResponseEntity<String> callCenterService(Map<String,String> headers, String param, String url, HttpMethod httpMethod) {
+ protected ResponseEntity<String> callCenterService(Map<String, String> headers, String param, String url, HttpMethod httpMethod) {
ResponseEntity<String> responseEntity = null;
if (StringUtil.isEmpty(param)) {
@@ -133,13 +140,13 @@
}
if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1");
+ headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
- headers.put(CommonConstant.USER_ID, "-1" );
+ headers.put(CommonConstant.USER_ID, "-1");
if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1" );
+ headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -432,26 +439,46 @@
*/
protected ComponentValidateResult validateStoreStaffCommunityRelationship(IPageData pd, RestTemplate restTemplate) {
- // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
- ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, responseEntity.getBody() + "");
+ //鑾峰彇鐢ㄦ埛id
+ String userId = pd.getUserId();
+ if (StringUtil.isEmpty(userId)) {
+ return new ComponentValidateResult(null, null, null, null, null);
}
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ //鏌ヨ褰撳墠鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(users, "鏌ヨ鐢ㄦ埛淇℃伅閿欒锛�");
+ if (!StringUtil.isEmpty(users.get(0).getLevelCd()) && !users.get(0).getLevelCd().equals("02")) { //02琛ㄧず鏅�氱敤鎴�
+ // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
+ ResponseEntity 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鑺傜偣");
+ 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");
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- String communityId = "";
- if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
- communityId = paramIn.getString("communityId");
- checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ String communityId = "";
+ if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ communityId = paramIn.getString("communityId");
+ checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ }
+ return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
+ } else {
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+ String communityId = "";
+ if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ communityId = paramIn.getString("communityId");
+ }
+ return new ComponentValidateResult(null, null, communityId, pd.getUserId(), pd.getUserName());
}
- return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
}
/**
@@ -536,16 +563,16 @@
ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- throw new SMOException("璋冪敤" + serviceCode + "澶辫触锛�" + responseEntity.getBody());
- }
-
JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
throw new SMOException(resultVo.getString("msg"));
}
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new SMOException(resultVo.getString("msg"));
+ }
+
Object bObj = resultVo.get("data");
JSONArray datas = null;
if (bObj instanceof JSONObject) {
--
Gitblit v1.8.0