From eca80efa8e040df44beb81d53f4478b7c3e35b7e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 16 六月 2023 17:05:22 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
index 65b649f..b5447b8 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -9,14 +9,13 @@
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
+import com.java110.dto.owner.OwnerCarOpenUserDto;
 import com.java110.dto.parking.ParkingAreaDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
 import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
-import com.java110.utils.cache.CommonCache;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.WechatConstant;
@@ -106,7 +105,10 @@
         }
         //鏌ヨ鐢ㄦ埛ID
         paramIn.put("userId", pd.getUserId());
-        String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum")+"&couponIds="+StringUtils.join(couponIds,",");
+        String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId")
+                + "&carNum=" + paramIn.getString("carNum")
+                + "&machineId=" + paramIn.getString("machineId")
+                +"&couponIds="+StringUtils.join(couponIds,",");
         responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
 
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -125,6 +127,7 @@
         if (money <= 0) {
             JSONObject paramOut = new JSONObject();
             paramOut.put("oId", orderId);
+            paramOut.put("payType", TempCarPayOrderDto.PAY_TYPE_WECHAT);
             String urlOut = "tempCarFee.notifyTempCarFeeOrder";
             responseEntity = this.callCenterService(getHeaders("-1", pd.getAppId()), paramOut.toJSONString(), urlOut, HttpMethod.POST);
             JSONObject param = new JSONObject();

--
Gitblit v1.8.0