From 2fa1d8e232e31b52e5594ab9e899cddad696c3fe Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 二月 2020 20:19:02 +0800
Subject: [PATCH] 业主登录服务端开发完成
---
AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java b/AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java
index c329545..d3a9f18 100644
--- a/AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java
+++ b/AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java
@@ -3,6 +3,7 @@
import com.java110.app.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.PayUtil;
@@ -49,7 +50,7 @@
try {
responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- responseEntity = new ResponseEntity<String>("璇锋眰涓嬫父绯荤粺寮傚父锛�" + e.getResponseBodyAsString(), e.getStatusCode());
+ responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -73,7 +74,7 @@
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
- double payAmount = PayUtil.getPayAmountByEnv("DEV", money);
+ double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
Map<String, String> resMap = this.java110UnifieldOrder(restTemplate,feeName, orderNum, wechatAuthProperties.TRADE_TYPE_JSAPI, payAmount, openId);
--
Gitblit v1.8.0