From e75b54b2db44d0096fc8afddc39f6fc8c40e6786 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 19 十一月 2022 14:54:35 +0800
Subject: [PATCH] 优化 支付

---
 service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatTempCarFeeToNotifyAdapt.java |   16 +++++++++-------
 1 files changed, 9 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..7f30ba9 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
@@ -24,6 +24,7 @@
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,7 +32,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,15 +133,16 @@
         }
 
         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);
+        paramIn.put("payType", TempCarPayOrderDto.PAY_TYPE_WECHAT);
         String url = "tempCarFee.notifyTempCarFeeOrder";
         /**
          *   postParameters.put("carNum", tempCarPayOrderDto.getCarNum());

--
Gitblit v1.8.0