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 64d6777..1e95dd5 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
@@ -17,6 +17,7 @@ import com.agileboot.domain.qywx.userQySys.db.SysUserQyUserEntity;
 import com.agileboot.domain.qywx.userQySys.db.SysUserQyUserService;
 import com.agileboot.domain.system.user.db.SysUserEntity;
 import com.agileboot.domain.system.user.db.SysUserService;
+import com.agileboot.domain.system.user.dto.UserDTO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,7 +44,13 @@ public class QyUserApplicationService {
 
     public QyUserDTO getQyUserDetail(Long id) {
         QyUserEntity user = userService.getById(id);
-        return new QyUserDTO(user);
+        QyUserDTO dto = new QyUserDTO(user);
+        SysUserQyUserEntity sysUserQyUser = sysUserQyUserService.getByQyUserId(id.intValue());
+        if (sysUserQyUser != null) {
+            SysUserEntity sysUser = sysUserService.getById(sysUserQyUser.getSysUserId());
+            dto.setSysUser(new UserDTO(sysUser));
+        }
+        return dto;
     }
 
     public List<QyUserEntity> selectAll() {
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java
index 8621556..f5c1c33 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java
@@ -11,6 +11,7 @@ import com.agileboot.domain.system.user.db.SysUserEntity;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.agileboot.domain.system.user.dto.UserDTO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +34,9 @@ public class QyUserDTO {
         }
     }
 
+    // 系统用户
+    private UserDTO sysUser;
+
     @ExcelColumn(name = "用户ID")
     private Integer id;
 
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 470e463..cbc2c4b 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
@@ -15,6 +15,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
 
     private Long orderId;
     private String openid;
+    private String userid;
     private Long cellId;
     private Long cabinetId;
     private Integer status;
@@ -32,6 +33,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
             .eq(orderId != null, "o.order_id", orderId)
             .eq(cellId != null, "og.cell_id", cellId)
             .eq(StrUtil.isNotBlank(openid), "o.openid", StringUtils.trim(openid))
+            .eq(StrUtil.isNotBlank(userid), "o.userid", StringUtils.trim(userid))
             .eq(cabinetId != null, "cc.cabinet_id", cabinetId)
             .eq(status != null, "o.status", status)
             .eq(payStatus != null, "o.pay_status", payStatus)