diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java
index f50aafd..9a61230 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java
@@ -146,17 +146,19 @@ public class OrderEventHandler extends BaseApplicationService {
             if (siteActivity.getChargeType() == 0) {
                 // 道具
                 Product product = productQueryService.queryById(siteActivity.getVipActivityId());
-                Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
-                ProductSpec productSpec = product.getProductSpecList().get(0);
-                OrderItem orderItem = OrderItem.build(productSpec.getProductId(), productSpec.getId(), product.getProductType(), product.getMainCategory(), product.getSubCategory(),
-                        product.getProductTitle(), BigDecimal.ZERO, 1);
-                orderItem.setSettlementAmount(BigDecimal.ZERO);
-                order.setSettlementAmount(BigDecimal.ZERO);
-                order.setOrderItemList(Collections.singletonList(orderItem));
-                //设置订单号
-                order.setOrderCode(snowFlakeUtil.getSnowflakeOrderCode());
-                BaseDomainEvent event = orderAggregate.complete(order);
-                this.sendEvent(event);
+                if (Objects.nonNull(product)) {
+                    Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
+                    ProductSpec productSpec = product.getProductSpecList().get(0);
+                    OrderItem orderItem = OrderItem.build(productSpec.getProductId(), productSpec.getId(), product.getProductType(), product.getMainCategory(), product.getSubCategory(),
+                            product.getProductTitle(), BigDecimal.ZERO, 1);
+                    orderItem.setSettlementAmount(BigDecimal.ZERO);
+                    order.setSettlementAmount(BigDecimal.ZERO);
+                    order.setOrderItemList(Collections.singletonList(orderItem));
+                    //设置订单号
+                    order.setOrderCode(snowFlakeUtil.getSnowflakeOrderCode());
+                    BaseDomainEvent event = orderAggregate.complete(order);
+                    this.sendEvent(event);
+                }
             } else if (siteActivity.getChargeType() == 1) {
                 // 收费活动
                 Order order = new Order();
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
index 6e77198..12cb515 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
@@ -153,7 +153,9 @@ public class ProductQueryServiceImpl implements ProductQueryService {
     @Override
     public Product queryById(Long id) {
         Product product = productDao.selectById(id);
-        product.setProductSpecList(listProductSpecBy(product.getId()));
+        if (Objects.nonNull(product)) {
+            product.setProductSpecList(listProductSpecBy(product.getId()));
+        }
         return product;
     }