From 9ca6c62acdd4bff4f312bb45e7a686e6cae91e7f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 02 十二月 2022 11:20:50 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index 8b4909d..d94e325 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -342,15 +342,11 @@
             log.error("调用微信支付异常,异常原因:" + e.getMessage());
         }
         //发送消息到mq
-        rabbitTemplate.convertAndSend(RabbitmqConfig.SHOP_ORDER_EXCHANGE, RabbitmqConfig.SHOP_ORDER_ROUTING_KEY, shopOrderVO, message -> {
-            message.getMessageProperties().setHeader("x-delay", 60*1000);
+        rabbitTemplate.convertAndSend("huacheng.shop.order.exchange", "huacheng.shop.order.key", shopOrderVO, message -> {
+            message.getMessageProperties().setHeader("x-delay", 30*1000);
             return message;
         });
         return R.ok(shopOrderVO);
-    }
-
-    private Long dateToSecond(Date expireTime){
-        return DateUtil.between(new Date(),expireTime, DateUnit.MS);
     }
 
     /**

--
Gitblit v1.7.1