From 8a2a463d46b3dce73015462c9f6a2a258dd25f5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 二月 2022 11:40:11 +0800
Subject: [PATCH] 优化diamante
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
index d4317a2..db5a723 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
@@ -17,25 +17,25 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.DefaultAbstractComponentSMO;
+import com.java110.api.smo.payment.adapt.IOweFeeToNotifyAdapt;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.api.properties.WechatAuthProperties;
-import com.java110.api.smo.payment.adapt.IOweFeeToNotifyAdapt;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
import java.util.*;
@@ -67,7 +67,7 @@
* @return
* @throws Exception
*/
- public String confirmPayFee(String param,String wId) {
+ public String confirmPayFee(String param, String wId) {
String resXml = "";
try {
Map<String, Object> map = PayUtil.getMapFromXML(param);
@@ -104,8 +104,16 @@
public int confirmPayFee(Map<String, Object> map) {
- String wId = map.get("wId").toString();
- wId = wId.replace(" ", "+");
+ String appId;
+ //鍏煎 娓竵浜ゆ槗鏃� 鎴栬�呭井淇℃湁鏃朵笉浼氭帀鍙傛暟鐨勯棶棰�
+ if (map.containsKey("wId")) {
+ String wId = map.get("wId").toString();
+ wId = wId.replace(" ", "+");
+ appId = WechatFactory.getAppId(wId);
+ } else {
+ appId = map.get("appid").toString();
+ }
+
SortedMap<String, String> paramMap = new TreeMap<String, String>();
ResponseEntity<String> responseEntity = null;
for (String key : map.keySet()) {
@@ -114,7 +122,7 @@
}
paramMap.put(key, map.get(key).toString());
}
- String appId = WechatFactory.getAppId(wId);
+
SmallWeChatDto smallWeChatDto = getSmallWechat(appId);
if (smallWeChatDto == null) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
@@ -157,17 +165,16 @@
JSONArray fees = paramIn.getJSONArray("fees");
JSONObject fee = null;
- for(int feeIndex = 0; feeIndex < fees.size();feeIndex ++){
+ for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
fee = fees.getJSONObject(feeIndex);
- if(fee.containsKey("deadlineTime")){
- fee.put("startTime",fee.getString("endTime"));
- fee.put("endTime",fee.getString("deadlineTime"));
- fee.put("receivedAmount",fee.getString("feePrice"));
- fee.put("state","");
+ if (fee.containsKey("deadlineTime")) {
+ fee.put("startTime", fee.getString("endTime"));
+ fee.put("endTime", fee.getString("deadlineTime"));
+ fee.put("receivedAmount", fee.getString("feePrice"));
+ fee.put("state", "");
}
}
}
-
private Map<String, String> getHeaders(String userId) {
--
Gitblit v1.8.0