From f278bf1dc5f6091b60acea56a5c19d1fa24a8aff Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 06 九月 2021 15:11:53 +0800
Subject: [PATCH] 优化 代码调整欠费欠费逻辑
---
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
old mode 100644
new mode 100755
index 6fd3e6b..a00da38
--- a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
@@ -18,6 +18,8 @@
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -32,8 +34,8 @@
@Override
protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
- if(StringUtil.isEmpty(pd.getUserId())){
- return new ResponseEntity<>("鏈寘鍚敤鎴蜂俊鎭�",HttpStatus.BAD_REQUEST);
+ if (StringUtil.isEmpty(pd.getUserId())) {
+ return new ResponseEntity<>("鏈寘鍚敤鎴蜂俊鎭�", HttpStatus.BAD_REQUEST);
}
return super.getStoreInfo(pd, restTemplate);
}
@@ -43,6 +45,11 @@
// 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
+ }
+
+ JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ if (!storeInfo.containsKey("storeId")) {
return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
}
@@ -63,13 +70,24 @@
}
@Override
- public ResponseEntity<String> doApi(String body, Map<String, String> headers, HttpServletRequest request) {
+ public ResponseEntity<String> doApi(String body, Map<String, String> headers, HttpServletRequest request) throws UnsupportedEncodingException {
HttpHeaders header = new HttpHeaders();
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+ for (String key : headers.keySet()
+ ) {
+ header.add(key, headers.get(key));
+ }
+
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
- header.add("user-id", result.getUserId());
- header.add("user-name", result.getUserName());
+ if (!StringUtil.isEmpty(result.getUserId())) {
+ header.remove("user-id");
+ header.add("user-id", result.getUserId());
+ if (!StringUtil.isEmpty(result.getUserName())) {
+ header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ }
+ }
+
header.add("store-id", result.getStoreId());
logger.debug("api璇锋眰澶�" + headers + ";璇锋眰鍐呭锛�" + body);
HttpMethod method = null;
@@ -89,11 +107,6 @@
}
- for (String key : headers.keySet()
- ) {
- header.add(key, headers.get(key));
- }
-
HttpEntity<String> httpEntity = new HttpEntity<String>(body, header);
logger.debug("璇锋眰鍚庣url" + url);
ResponseEntity<String> responseEntity = null;
@@ -105,8 +118,8 @@
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("api杩斿洖淇℃伅" + responseEntity);
- return responseEntity;
}
+ return responseEntity;
}
--
Gitblit v1.8.0