From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..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
@@ -115,7 +115,7 @@
rentingHourseRegister.setStatus(2);
rentingHourseRegister.setDetailStatus(4);
rentingHourseRegisterDao.updateById(rentingHourseRegister);
- rabbitTemplate.convertAndSend("order.exchange", "order.key", rentingHourseOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.order.exchange", "huacheng.order.key", rentingHourseOrder, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(DateUtil.endOfDay(DateUtil.date())) * 1000 * 3600);
return message;
});
@@ -128,7 +128,7 @@
rentingHourseRegister.setStatus(2);
rentingHourseRegister.setDetailStatus(4);
rentingHourseRegisterDao.updateById(rentingHourseRegister);
- rabbitTemplate.convertAndSend("preOrder.exchange", "preOrder.key", rentingHoursePreOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.preOrder.exchange", "huacheng.preOrder.key", rentingHoursePreOrder, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(rentingHoursePreOrder.getExpireDate()) * 1000 * 3600);
return message;
});
@@ -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