diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java
index 69532d3..d21e767 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/SmartCabinetApplicationService.java
@@ -89,6 +89,7 @@ public class SmartCabinetApplicationService {
                 // 设置单元格基础信息
                 cellInfo.setCellId(cell.getCellId());
                 cellInfo.setPinNo(cell.getPinNo());
+                cellInfo.setStock(cell.getStock());
 
                 // 处理单元格关联的商品信息
                 if (cell.getGoodsId() != null) {
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java
index fedecdc..c7cc523 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/CabinetDetailDTO.java
@@ -16,6 +16,7 @@ public class CabinetDetailDTO {
     public static class CellInfoDTO {
         private Long cellId;
         private Integer pinNo;
+        private Integer stock;
         private ProductInfoDTO product;
     }
 
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
index 66d5fdf..96c301d 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
 
     private Long orderId;
+    private String openid;
     private Long cellId;
     private Long cabinetId;
     private Integer status;
@@ -29,6 +30,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
         queryWrapper
             .eq(orderId != null, "o.order_id", orderId)
             .eq(cellId != null, "og.cell_id", cellId)
+            .eq(StrUtil.isNotBlank(openid), "o.openid", openid.trim())
             .eq(cabinetId != null, "cc.cabinet_id", cabinetId)
             .eq(status != null, "o.status", status)
             .eq(payStatus != null, "o.pay_status", payStatus)