From 6e18e90467c5699eca7cd4d6056ac2289c15680e Mon Sep 17 00:00:00 2001
From: Cauchy <mailcauchy@gmail.com>
Date: Tue, 10 Oct 2023 17:27:57 +0800
Subject: [PATCH] bug fix

---
 .../peanut/modules/book/controller/BuyOrderController.java   | 5 +++--
 .../com/peanut/modules/mq/Consumer/OrderCancelConsumer.java  | 4 +++-
 src/main/resources/weChatConfig.properties                   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index 08291f93..6d52920a 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -269,6 +269,7 @@ public class BuyOrderController {
     @RequestMapping("/appGetOrderInfo/{type}")
     public R appGetOrderInfo(@PathVariable String type, @RequestParam("orderId") Integer orderId) {
         BuyOrderEntity buyOrder = buyOrderService.getById(orderId);
+        buyOrder.setTimestamp(buyOrder.getCreateTime().getTime()/1000);
         List<BuyOrderDetailEntity> orderDetail = null;
         if ("1".equals(type)) {
             orderDetail = buyOrderDetailService.getBaseMapper().selectList(new QueryWrapper<BuyOrderDetailEntity>()
@@ -547,8 +548,8 @@ public class BuyOrderController {
     private MessagePostProcessor messagePostProcessor() {
         return message -> {
             //设置有效期30分钟
-            //message.getMessageProperties().setExpiration("1800000");
-            message.getMessageProperties().setExpiration("30000");
+            //message.getMessageProperties().setExpiration(String.valueOf(30*60*1000));
+            message.getMessageProperties().setExpiration(String.valueOf(30*1000));
             return message;
         };
     }
diff --git a/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java b/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
index c2a3251b..6cf45aca 100644
--- a/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
+++ b/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
@@ -21,7 +21,9 @@ public class OrderCancelConsumer {
     @RabbitListener(queues = DelayQueueConfig.ORDER_CANCEL_DEAD_LETTER_QUEUE)
     public void orderConsumer(String orderId) {
         BuyOrderEntity buyOrder = buyOrderService.getById(orderId);
-        buyOrder.setOrderStatus(Constants.ORDER_STATUS_OUT_OF_TIME);
+        if(Constants.ORDER_STATUS_TO_BE_PAID.equals(buyOrder.getOrderStatus())){
+            buyOrder.setOrderStatus(Constants.ORDER_STATUS_OUT_OF_TIME);
+        }
         buyOrderService.updateById(buyOrder);
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/weChatConfig.properties b/src/main/resources/weChatConfig.properties
index d7592aa6..d50d1604 100644
--- a/src/main/resources/weChatConfig.properties
+++ b/src/main/resources/weChatConfig.properties
@@ -5,7 +5,7 @@ wxpay.mchId:1612860909
 # ?? URL
 wxpay.payUrl:https://api.mch.weixin.qq.com/v3/pay/transactions/app
 # ????
-wxpay.notifyUrl:https://api.nuttyreading.com/pay/payNotify
+wxpay.notifyUrl:https://testapi.nuttyreading.com/pay/payNotify
 # ?? url
 wxpay.refundNotifyUrl:http://pjm6m9.natappfree.cc/pay/refundNotify
 # key pem