Merge branch 'dev/2024/0625/update-admin-Y' of Harper/feifan-backend-zx-admin into master

修改支付定时器

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/mq/consumer/order/OrderConsumer.java

@@ -3,7 +3,6 @@ package cn.newfeifan.mall.module.trade.mq.consumer.order;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -16,7 +15,6 @@ public class OrderConsumer {
     private TradeOrderUpdateService tradeOrderUpdateService;
 
     @EventListener
-    @Async // Spring Event 默认在 Producer 发送的线程，通过 @Async 实现异步
     public void onMessage(Long payOrderId) {
         //修改订单状态，并计算权益
         tradeOrderUpdateService.updateOrderPaid(payOrderId);

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/order/PayOrderServiceImpl.java

@@ -363,6 +363,8 @@ public class PayOrderServiceImpl implements PayOrderService {
         if (updateCounts == 0) { // 校验状态，必须是待支付
             throw exception(PAY_ORDER_STATUS_IS_NOT_WAITING);
         }
+        PayOrderDO payOrderDO = orderMapper.selectById(order.getId());
+        System.out.println(payOrderDO.getStatus());
 
         //如果确实是漏了订单未支付成功，那就补充回来
         tradeOrderProducer.sendTradeOrderMessage(order.getId());