From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

---
 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 784653e..4cedd14 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