From e5cef041931401a6d0955d46163d5b2f7b65e091 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 十二月 2020 00:19:26 +0800
Subject: [PATCH] 优化二维码生成
---
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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
index 6fd3e6b..8ecb397 100644
--- 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
@@ -32,8 +32,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 +43,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());
}
@@ -68,8 +73,10 @@
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
- header.add("user-id", result.getUserId());
- header.add("user-name", result.getUserName());
+ if (!StringUtil.isEmpty(result.getUserId())) {
+ header.add("user-id", result.getUserId());
+ header.add("user-name", result.getUserName());
+ }
header.add("store-id", result.getStoreId());
logger.debug("api璇锋眰澶�" + headers + ";璇锋眰鍐呭锛�" + body);
HttpMethod method = null;
--
Gitblit v1.8.0