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

更新定时查询支付订单2

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/consumer/topupconsumptionpoints/TopUpConsumptionPointsConsumer.java

@@ -2,10 +2,14 @@ package cn.newfeifan.mall.module.distri.mq.consumer.topupconsumptionpoints;
 
 import cn.newfeifan.mall.module.distri.service.usertopupconsumptionpointsorder.UserTopUpConsumptionPointsOrderService;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Component
+@Slf4j
 public class TopUpConsumptionPointsConsumer {
 
     @Resource

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

@@ -374,11 +374,15 @@ public class PayOrderServiceImpl implements PayOrderService {
         PayOrderDO payOrderDO = orderMapper.selectById(order.getId());
         System.out.println(payOrderDO.getStatus());
 
+        log.info("pt端补漏分配权益订单");
+
         // 判断是商品订单还是充值订单
         if (payOrderDO.getNo().contains(DictTypeConstants.TUP_UP_NO)) {
+            log.info("充值订单号:{}", payOrderDO.getNo());
             // 充值消费分订单
             topUpConsumptionPointsProducer.sendTradeOrderMessage(payOrderDO);
         } else {
+            log.info("商品订单号:{}", payOrderDO.getNo());
             //如果确实是漏了订单未支付成功，那就补充回来
             tradeOrderProducer.sendTradeOrderMessage(order.getId());
         }