合并支付

src/main/java/com/izouma/nineth/event/OrderNotifyEvent.java

@@ -15,6 +15,7 @@ public class OrderNotifyEvent implements Serializable {
     public static final String TYPE_MINT_ORDER = "mint_order";
     public static final String TYPE_GIFT_ORDER = "gift_order";
     public static final String TYPE_RECHARGE   = "recharge";
+    public static final String TYPE_AUCTION_ORDER   = "auction_order";
 
     private Long      orderId;
     private PayMethod payMethod;

src/main/java/com/izouma/nineth/listener/OrderNotifyListener.java

@@ -1,11 +1,7 @@
 package com.izouma.nineth.listener;
 
-import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.event.OrderNotifyEvent;
-import com.izouma.nineth.service.GiftOrderService;
-import com.izouma.nineth.service.MintOrderService;
-import com.izouma.nineth.service.OrderService;
-import com.izouma.nineth.service.UserBalanceService;
+import com.izouma.nineth.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.annotation.ConsumeMode;
@@ -23,10 +19,11 @@ import org.springframework.stereotype.Service;
         consumeMode = ConsumeMode.CONCURRENTLY, consumeThreadMax = 2)
 @ConditionalOnProperty(value = "general.notify-server", havingValue = "true")
 public class OrderNotifyListener implements RocketMQListener<OrderNotifyEvent> {
-    private OrderService       orderService;
-    private MintOrderService   mintOrderService;
-    private GiftOrderService   giftOrderService;
-    private UserBalanceService userBalanceService;
+    private OrderService        orderService;
+    private MintOrderService    mintOrderService;
+    private GiftOrderService    giftOrderService;
+    private UserBalanceService  userBalanceService;
+    private AuctionOrderService auctionOrderService;
 
     @Override
     public void onMessage(OrderNotifyEvent e) {
@@ -43,6 +40,10 @@ public class OrderNotifyListener implements RocketMQListener<OrderNotifyEvent> {
             case OrderNotifyEvent.TYPE_RECHARGE:
                 userBalanceService.recharge(e.getOrderId(), e.getPayMethod(), e.getTransactionId());
                 break;
+            case OrderNotifyEvent.TYPE_AUCTION_ORDER:
+                //拍卖回调
+                auctionOrderService.notify(e.getOrderId(), e.getPayMethod(), e.getTransactionId());
+                break;
             case OrderNotifyEvent.TYPE_ORDER:
             default:
                 orderService.notifyOrder(e.getOrderId(), e.getPayMethod(), e.getTransactionId());

src/main/java/com/izouma/nineth/web/HmPayController.java

@@ -71,7 +71,7 @@ public class HmPayController extends BaseController {
                 case "auctionOrder":
                     rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
                             new OrderNotifyEvent(id, PayMethod.SANDPAY, plat_trx_no,
-                                    System.currentTimeMillis(), OrderNotifyEvent.TYPE_MINT_ORDER));
+                                    System.currentTimeMillis(), OrderNotifyEvent.TYPE_AUCTION_ORDER));
                     break;
             }
         }

src/main/java/com/izouma/nineth/web/PayEaseController.java

@@ -61,7 +61,7 @@ public class PayEaseController {
                 case "auctionOrder":
                     rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
                             new OrderNotifyEvent(id, PayMethod.SANDPAY, serialNumber,
-                                    System.currentTimeMillis(), OrderNotifyEvent.TYPE_RECHARGE));
+                                    System.currentTimeMillis(), OrderNotifyEvent.TYPE_AUCTION_ORDER));
                     break;
             }
         }

src/main/java/com/izouma/nineth/web/SandPayController.java

@@ -78,7 +78,7 @@ public class SandPayController {
                             case "auctionOrder":
                                 rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
                                         new OrderNotifyEvent(id, PayMethod.SANDPAY, payOrderCode,
-                                                System.currentTimeMillis(), OrderNotifyEvent.TYPE_RECHARGE));
+                                                System.currentTimeMillis(), OrderNotifyEvent.TYPE_AUCTION_ORDER));
                                 break;
                         }
                     }