From 4e649ff1f69583493027855f54c65e8207f4f860 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 06 八月 2020 15:57:19 +0800
Subject: [PATCH] 优化费用导入模板下载功能
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
index f871a4e..03921fc 100644
--- a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
+++ b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -2,6 +2,7 @@
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.WechatFactory;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.front.properties.WechatAuthProperties;
import com.java110.utils.cache.MappingCache;
@@ -12,11 +13,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -30,6 +27,9 @@
@Autowired
private WechatAuthProperties wechatAuthProperties;
+ @Autowired
+ private RestTemplate restTemplate;
+
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
// 寰俊鏈嶅姟鍟嗘敮浠樺紑鍏�
@@ -40,6 +40,7 @@
private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
+
/**
* 璋冪敤涓績鏈嶅姟
@@ -128,7 +129,7 @@
private Map<String, String> java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum,
String tradeType, double payAmount, String openid,
SmallWeChatDto smallWeChatDto) throws Exception {
-//灏佽鍙傛暟
+
SortedMap<String, String> paramMap = new TreeMap<String, String>();
paramMap.put("appid", smallWeChatDto.getAppId());
paramMap.put("mch_id", smallWeChatDto.getMchId());
@@ -137,7 +138,7 @@
paramMap.put("out_trade_no", orderNum);
paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
- paramMap.put("notify_url", wechatAuthProperties.getWxNotifyUrl());
+ paramMap.put("notify_url", wechatAuthProperties.getWxNotifyUrl() + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
paramMap.put("trade_type", tradeType);
paramMap.put("openid", openid);
--
Gitblit v1.8.0