From b103184a1e3d9731f4ae635c12f4c9397ae61e18 Mon Sep 17 00:00:00 2001 From: dzq Date: Mon, 19 May 2025 08:21:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在QyUserDTO中添加了sysUser字段，用于存储关联的系统用户信息。同时，在SearchShopOrderQuery中添加了userid字段，以便根据用户ID进行订单查询。这些改动是为了增强系统用户与企业微信用户之间的关联性，并提供更灵活的订单查询功能。 --- .../domain/qywx/user/QyUserApplicationService.java | 9 ++++++++- .../com/agileboot/domain/qywx/user/dto/QyUserDTO.java | 4 ++++ .../domain/shop/order/query/SearchShopOrderQuery.java | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) 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 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 extends AbstractPageQuery { 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 extends AbstractPageQuery { .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)