From 584d21464cd36f371705d9e17b5e6cb6f6d1f0b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 24 五月 2020 16:16:14 +0800
Subject: [PATCH] 优化订单支付确认支付报错问题
---
FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java b/FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java
index e31ad6b..869f4e4 100644
--- a/FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java
+++ b/FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java
@@ -6,6 +6,7 @@
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import org.thymeleaf.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
@@ -39,16 +41,20 @@
@RequestMapping(path = "/loginOwner", method = RequestMethod.POST)
public ResponseEntity<String> loginOwner(@RequestBody String postInfo, HttpServletRequest request) {
/*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+ String appId = request.getHeader("APP_ID");
+ if(StringUtil.isEmpty(appId)){
+ appId = request.getHeader("APP-ID");
+ }
IPageData pd = PageData.newInstance().builder("", "", "", postInfo,
- "login", "", "", "",
- request.getHeader("APP_ID"));
+ "login", "", "", "", appId
+ );
ResponseEntity<String> responseEntity = ownerAppLoginSMOImpl.doLogin(pd);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
JSONObject outParam = JSONObject.parseObject(responseEntity.getBody());
pd.setToken(outParam.getString("token"));
- request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA,pd);
+ request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
return responseEntity;
}
--
Gitblit v1.8.0