展示优惠券活动下的优惠券列表详情

consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java

@@ -56,10 +56,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
 
         switch (orderMessage.getNewStatus()) {
             case PAID: {
-<<<<<<< HEAD
-=======
                 //获取订单详情
->>>>>>> master
                 OrderDetailVO order = orderService.queryDetail(orderMessage.getOrderSn());
                 //库存key 和 扣减数量
                 List<String> keys = new ArrayList<>();
@@ -87,10 +84,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
                 break;
             }
             case CANCELLED: {
-<<<<<<< HEAD
-=======
                 //获取订单详情
->>>>>>> master
                 OrderDetailVO order = orderService.queryDetail(orderMessage.getOrderSn());
                 //判定是否已支付 并且 非库存不足导致库存回滚 则需要考虑订单库存返还业务
                 if (order.getOrder().getPayStatus().equals(PayStatusEnum.PAID.name()) && order.getOrder().getCancelReason().equals(outOfStockMessage)) {