From 3f2c86dbcf14019ce74d02fc820050f1f241b880 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 10 六月 2020 11:58:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
index 20ce116..02dc7d2 100644
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java
@@ -76,9 +76,11 @@
JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
String openId = realUserInfo.getString("openId");
+ String payAppId = orderInfo.getString("payAppId");
+ String payMchId = orderInfo.getString("payMchId");
//寰俊涓嬪崟PayUtil
- Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"),paramIn.getString("tradeType"), orderId, money, openId);
+ Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"),paramIn.getString("tradeType"), orderId, money, openId,payAppId,payMchId);
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
return responseEntity;
--
Gitblit v1.8.0