From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22: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/GoodsToPaySMOImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/GoodsToPaySMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/GoodsToPaySMOImpl.java
index b8f5b0b..374ca68 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/GoodsToPaySMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/GoodsToPaySMOImpl.java
@@ -6,13 +6,12 @@
import com.java110.core.context.PageData;
import com.java110.dto.app.AppDto;
import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.AppAbstractComponentSMO;
import com.java110.api.smo.payment.IGoodsToPaySMO;
import com.java110.api.smo.payment.adapt.IPayAdapt;
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;
@@ -20,7 +19,7 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
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;
@@ -76,7 +75,7 @@
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = ServiceConstant.SERVICE_API_URL + "/api/storeOrder/saveStoreOrder";
+ String url = "/storeOrder/saveStoreOrder";
responseEntity = super.callCenterService(restTemplate, pd, paramIn.toJSONString(), url, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -136,7 +135,7 @@
"", "", "", "",
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
+ "smallWeChat.listSmallWeChats?appId="
+ paramIn.getString("appId") + "&page=1&row=1", HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
--
Gitblit v1.8.0