diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
index 1fb387c..f40f795 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java
@@ -63,6 +63,27 @@ public class ShopOrder implements Serializable {
     @Schema(description = "商户编号")
     private String merchantCode;
 
+    @Schema(description = "店铺ID")
+    private Integer storeId;
+
+    @Schema(description = "店铺名称")
+    @TableField(exist = false)
+    private String storeName;
+
+    @Schema(description = "配送员ID")
+    private Integer riderId;
+
+    @Schema(description = "配送员名称")
+    @TableField(exist = false)
+    private String riderName;
+
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+    @Schema(description = "仓库名称")
+    @TableField(exist = false)
+    private String warehouseName;
+
     @Schema(description = "使用的优惠券id")
     private Integer couponId;
 
@@ -103,6 +124,9 @@ public class ShopOrder implements Serializable {
     @Schema(description = "配送结束时间")
     private String sendEndTime;
 
+    @Schema(description = "送达拍照记录")
+    private String sendEndImg;
+
     @Schema(description = "发货店铺id")
     private Integer expressMerchantId;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
index cd3f542..ef2cbe8 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
@@ -4,9 +4,12 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.nickname, b.avatar,b.phone as phone
+        SELECT a.*,b.nickname, b.avatar,b.phone as phone, c.name as storeName, d.real_name as riderName, e.name as warehouseName
         FROM shop_order a
         LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN shop_store c ON a.store_id = c.id
+        LEFT JOIN shop_rider d ON a.rider_id = d.id
+        LEFT JOIN shop_warehouse e ON a.warehouse_id = e.id
         <where>
             <if test="param.orderId != null">
                 AND a.order_id = #{param.orderId}
@@ -38,6 +41,15 @@
             <if test="param.merchantCode != null">
                 AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
             </if>
+            <if test="param.storeId != null">
+              AND a.store_id LIKE CONCAT('%', #{param.storeId}, '%')
+            </if>
+            <if test="param.riderId != null">
+              AND a.rider_id LIKE CONCAT('%', #{param.riderId}, '%')
+            </if>
+            <if test="param.warehouseId != null">
+              AND a.warehouse_id LIKE CONCAT('%', #{param.warehouseId}, '%')
+            </if>
             <if test="param.couponId != null">
                 AND a.coupon_id = #{param.couponId}
             </if>
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
index 2fd9182..2d61365 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
@@ -58,6 +58,15 @@ public class ShopOrderParam extends BaseParam {
     @Schema(description = "商户编号")
     private String merchantCode;
 
+    @Schema(description = "店铺ID")
+    private Integer storeId;
+
+    @Schema(description = "配送员ID")
+    private Integer riderId;
+
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
     @Schema(description = "使用的优惠券id")
     @QueryField(type = QueryType.EQ)
     private Integer couponId;