From ef15b7b31e09cac01aaa993aa27fae14888dfbd6 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 19 十一月 2022 14:57:27 +0800
Subject: [PATCH] 优化 支付
---
springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
index 6319519..1c05445 100644
--- a/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -13,6 +13,7 @@
import com.java110.dto.ownerCarOpenUser.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;
@@ -102,12 +103,15 @@
List<String> couponIds = new ArrayList<String>();
if (couponList != null && couponList.size() > 0) {
for (int couponIndex = 0; couponIndex < couponList.size(); couponIndex++) {
- couponIds.add(couponList.getJSONObject(couponIndex).getString("couponId"));
+ couponIds.add(couponList.getString(couponIndex));
}
}
//鏌ヨ鐢ㄦ埛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) {
@@ -126,6 +130,7 @@
if (money <= 0) {
JSONObject paramOut = new JSONObject();
paramOut.put("oId", orderId);
+ paramIn.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