From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarInoutSMOImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarInoutSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
index 347df7f..8c6ef2c 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
@@ -2,15 +2,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.context.IPageData;
-import com.java110.core.context.PageData;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.AppAbstractComponentSMO;
import com.java110.api.smo.payment.IToPayTempCarInoutSMO;
import com.java110.api.smo.payment.adapt.IPayAdapt;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
@@ -70,7 +69,7 @@
}
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = ServiceConstant.SERVICE_API_URL + "/api/fee.payFeePreTempCarInout";
+ String url = "fee.payFeePreTempCarInout";
responseEntity = super.callCenterService(restTemplate, pd, paramIn.toJSONString(), url, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -112,12 +111,15 @@
ResponseEntity responseEntity = null;
+ if (!paramIn.containsKey("appId") || StringUtil.isEmpty(paramIn.getString("appId"))) {
+ return null;
+ }
pd = PageData.newInstance().builder(pd.getUserId(), "", "", pd.getReqData(),
"", "", "", "",
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
- + paramIn.getString("appId") + "&page=1&row=1&communityId="+paramIn.getString("communityId"), HttpMethod.GET);
+ "smallWeChat.listSmallWeChats?appId="
+ + paramIn.getString("appId") + "&page=1&row=1&communityId=" + paramIn.getString("communityId"), HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return null;
--
Gitblit v1.8.0