From e378405bd2968d78d1ddf43b5e326f19d39fa4a3 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 14 四月 2022 09:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
index 2b7eaa2..ab1a5e4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
@@ -148,7 +148,7 @@
}
// 调用wx支付
WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "签订租房合同", wxPayOrderVO.getOpenId(),
- wxPayOrderVO.getOrderSn(), money);
+ wxPayOrderVO.getOrderSn(), money,null);
return R.ok();
} catch (Exception e) {
log.error("调用微信支付异常,异常原因：" + e.getMessage());
@@ -162,7 +162,7 @@
}
// 调用wx支付
WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "定金支付", wxPayOrderVO.getOpenId(),
- wxPayOrderVO.getOrderSn(), money);
+ wxPayOrderVO.getOrderSn(), money,null);
return R.ok();
} catch (Exception e) {
log.error("调用微信支付异常,异常原因：" + e.getMessage());
--
Gitblit v1.7.1