diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java
index 84e131d..1c87904 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java
@@ -63,8 +63,12 @@ public class QyUserApplicationService {
                 dto.setRoleName(sysRole.getRoleName());
             }
         }
-        Ab98UserEntity ab98User = ab98UserService.getById(user.getAb98UserId());
-        dto.setOpenid(ab98User.getOpenid());
+        if (user.getAb98UserId() != null) {
+            Ab98UserEntity ab98User = ab98UserService.getById(user.getAb98UserId());
+            if (ab98User != null) {
+                dto.setOpenid(ab98User.getOpenid());
+            }
+        }
         return dto;
     }
 
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
index 7894ded..d225a56 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
@@ -85,7 +85,7 @@ public interface ShopGoodsMapper extends BaseMapper<ShopGoodsEntity> {
     List<SearchGoodsWithCabinetDO> getGoodsWithCabinetListByShopId(@Param("shopId")Long shopId);
 
     @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " +
-            "g.stock, g.status, g.auto_approval, g.cover_img, SUM(cc.stock) AS total_stock, " +
+            "g.stock, g.status, g.auto_approval, g.cover_img, g.goods_detail, g.usage_instruction, SUM(cc.stock) AS total_stock, " +
             "GROUP_CONCAT(DISTINCT cc.cell_no) AS cell_no_str, " +
             "GROUP_CONCAT(DISTINCT sc.cabinet_name) AS cabinet_name " +
             "FROM shop_goods g " +
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 c2b7a91..590ffe2 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
@@ -18,6 +18,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
     private String userid;
     private Long cellId;
     private Long cabinetId;
+    private Long goodsId;
     private Integer status;
     private Integer payStatus;
     private Date startTime;
@@ -39,6 +40,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
                          .or()
                          .eq("o.userid", StringUtils.trim(userid)))
             .eq(cabinetId != null, "cc.cabinet_id", cabinetId)
+            .eq(goodsId!= null, "og.goods_id", goodsId)
             .eq(status != null, "o.status", status)
             .eq(payStatus != null, "o.pay_status", payStatus)
             .eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod)