From e75b54b2db44d0096fc8afddc39f6fc8c40e6786 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 19 十一月 2022 14:54:35 +0800
Subject: [PATCH] 优化 支付

---
 service-api/src/main/java/com/java110/api/smo/login/impl/PropertyAppLoginSMOImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/login/impl/PropertyAppLoginSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/login/impl/PropertyAppLoginSMOImpl.java
index 4830f78..d2b3527 100644
--- a/service-api/src/main/java/com/java110/api/smo/login/impl/PropertyAppLoginSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/login/impl/PropertyAppLoginSMOImpl.java
@@ -1,6 +1,7 @@
 package com.java110.api.smo.login.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.core.factory.AuthenticationFactory;
@@ -10,7 +11,7 @@
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -22,7 +23,7 @@
  * wx鐧诲綍
  */
 @Service("propertyAppLoginSMOImpl")
-public class PropertyAppLoginSMOImpl extends AppAbstractComponentSMO implements IPropertyAppLoginSMO {
+public class PropertyAppLoginSMOImpl extends DefaultAbstractComponentSMO implements IPropertyAppLoginSMO {
 
     private final static Logger logger = LoggerFactory.getLogger(PropertyAppLoginSMOImpl.class);
 
@@ -53,12 +54,16 @@
         JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
 
         loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("password")));
-        responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), ServiceConstant.SERVICE_API_URL +"/api/user.service.login", HttpMethod.POST);
+        responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), "user.service.login", HttpMethod.POST);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
         }
 
         JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
+
+        if (userInfo.containsKey("code") && 0 != userInfo.getIntValue("code")) {
+            return responseEntity;
+        }
 
         //鏍规嵁鐢ㄦ埛鏌ヨ鍟嗘埛淇℃伅
         String userId = userInfo.getString("userId");
@@ -81,6 +86,8 @@
         userInfo.put("storeTypeCd", storeInfo.getString("storeTypeCd"));
         JSONObject paramOut = new JSONObject();
         paramOut.put("result", 0);
+        paramOut.put("code", 0);
+        paramOut.put("msg", "鎴愬姛");
         paramOut.put("userInfo", userInfo);
         paramOut.put("token", userInfo.getString("token"));
         //pd.setToken(JSONObject.parseObject(responseEntity.getBody()).getString("token"));

--
Gitblit v1.8.0