From 7b0e7c62dab0061d2aa167b46f8a838f363f579a Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 17 一月 2022 17:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java
index ce5a06f..fb5c234 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java
@@ -31,7 +31,7 @@
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
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;
@@ -132,14 +132,14 @@
}
String orderId = map.get("out_trade_no").toString();
- String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_TEMP_CAR_FEE + orderId);
-
- if (StringUtil.isEmpty(order)) {
- return 1;// 璇存槑宸茬粡澶勭悊杩囦簡 鍐嶄笉澶勭悊
- }
+// String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_TEMP_CAR_FEE + orderId);
+//
+// if (StringUtil.isEmpty(order)) {
+// return 1;// 璇存槑宸茬粡澶勭悊杩囦簡 鍐嶄笉澶勭悊
+// }
//鏌ヨ鐢ㄦ埛ID
- JSONObject paramIn = JSONObject.parseObject(order);
+ JSONObject paramIn = new JSONObject();
paramIn.put("oId", orderId);
String url = "tempCarFee.notifyTempCarFeeOrder";
/**
--
Gitblit v1.8.0