diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java
index d503481a..fa1408c2 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java
@@ -44,7 +44,7 @@ public class ShopStoreToProductServiceImpl extends ServiceImpl<ShopStoreToProduc
                 .stream().map(ShopStoreToProductEntity::getProductId).collect(Collectors.toList());
         LambdaQueryWrapper<ShopProduct> shopProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
         shopProductLambdaQueryWrapper.like(StringUtils.isNotBlank(param.getKeywords()),ShopProduct::getProductName,param.getKeywords());
-        shopProductLambdaQueryWrapper.eq(param.getType().equals("00"),ShopProduct::getGoodsType,param.getType());
+        shopProductLambdaQueryWrapper.eq(!param.getType().equals("00"),ShopProduct::getGoodsType,param.getType());
         shopProductLambdaQueryWrapper.notIn(collect.size()>0,ShopProduct::getProductId,collect);
         Page<ShopProduct> shopProductPage = shopProductDao.selectPage(new Page<>(param.getPage(), param.getLimit()), shopProductLambdaQueryWrapper);
         return shopProductPage;
diff --git a/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java b/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
index a4f2d5ab..cd398e90 100644
--- a/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
+++ b/src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java
@@ -34,19 +34,20 @@ public class OrderCancelConsumer {
     public void orderConsumer(String orderId) {
         BuyOrder buyOrder = buyOrderService.getById(orderId);
         if(buyOrder == null){
+
             return;
         }
         if(Constants.ORDER_STATUS_TO_BE_PAID.equals(buyOrder.getOrderStatus())){
             buyOrder.setOrderStatus(Constants.ORDER_STATUS_OUT_OF_TIME);
             //回滚库存
-            LambdaQueryWrapper<BuyOrderProduct> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId());
-            List<BuyOrderProduct> buyOrderProducts = buyOrderProductDao.selectList(wrapper);
-            for (BuyOrderProduct b : buyOrderProducts){
-                ShopProduct shopProduct = shopProductDao.selectById(b.getProductId());
-                shopProduct.setProductStock(shopProduct.getProductStock()+b.getQuantity());
-                shopProductDao.updateById(shopProduct);
-            }
+//            LambdaQueryWrapper<BuyOrderProduct> wrapper = new LambdaQueryWrapper<>();
+//            wrapper.eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId());
+//            List<BuyOrderProduct> buyOrderProducts = buyOrderProductDao.selectList(wrapper);
+//            for (BuyOrderProduct b : buyOrderProducts){
+//                ShopProduct shopProduct = shopProductDao.selectById(b.getProductId());
+//                shopProduct.setProductStock(shopProduct.getProductStock()+b.getQuantity());
+//                shopProductDao.updateById(shopProduct);
+//            }
         }
         buyOrderService.updateById(buyOrder);
         if(Constants.ORDER_STATUS_OUT_OF_TIME.equals(buyOrder.getOrderStatus())){