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 |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 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 c72cb78..a00da38 100755
--- 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
@@ -12,11 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
@@ -78,8 +74,14 @@
         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);
         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"));
@@ -104,11 +106,6 @@
             throw new IllegalArgumentException("涓嶆敮鎸佺殑璇锋眰鏂瑰紡" + headers.get(CommonConstant.HTTP_METHOD));
         }
 
-
-        for (String key : headers.keySet()
-        ) {
-            header.add(key, headers.get(key));
-        }
 
         HttpEntity<String> httpEntity = new HttpEntity<String>(body, header);
         logger.debug("璇锋眰鍚庣url" + url);

--
Gitblit v1.8.0