admin123
/
shop-back-end
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 添加企业微信用户详情中的系统用户信息和订单查询中的用户ID字段 

在QyUserDTO中添加了sysUser字段，用于存储关联的系统用户信息。同时，在SearchShopOrderQuery中添加了userid字段，以便根据用户ID进行订单查询。这些改动是为了增强系统用户与企业微信用户之间的关联性，并提供更灵活的订单查询功能。
This commit is contained in:
dzq 2025-05-19 08:21:27 +08:00
parent 4e5ca6ea07
commit b103184a1e
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java
View File

@ -17,6 +17,7 @@ import com.agileboot.domain.qywx.userQySys.db.SysUserQyUserEntity;
import com.agileboot.domain.qywx.userQySys.db.SysUserQyUserService; import com.agileboot.domain.qywx.userQySys.db.SysUserQyUserService;
import com.agileboot.domain.system.user.db.SysUserEntity; import com.agileboot.domain.system.user.db.SysUserEntity;
import com.agileboot.domain.system.user.db.SysUserService; 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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -43,7 +44,13 @@ public class QyUserApplicationService {
public QyUserDTO getQyUserDetail(Long id) { public QyUserDTO getQyUserDetail(Long id) {
QyUserEntity user = userService.getById(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() { public List<QyUserEntity> selectAll() {

4
agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/dto/QyUserDTO.java
View File

@ -11,6 +11,7 @@ import com.agileboot.domain.system.user.db.SysUserEntity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.agileboot.domain.system.user.dto.UserDTO;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -33,6 +34,9 @@ public class QyUserDTO {
} }
} }
// 系统用户
private UserDTO sysUser;
@ExcelColumn(name = "用户ID") @ExcelColumn(name = "用户ID")
private Integer id; private Integer id;

2
agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
View File

@ -15,6 +15,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
private Long orderId; private Long orderId;
private String openid; private String openid;
private String userid;
private Long cellId; private Long cellId;
private Long cabinetId; private Long cabinetId;
private Integer status; private Integer status;
@ -32,6 +33,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
.eq(orderId != null, "o.order_id", orderId) .eq(orderId != null, "o.order_id", orderId)
.eq(cellId != null, "og.cell_id", cellId) .eq(cellId != null, "og.cell_id", cellId)
.eq(StrUtil.isNotBlank(openid), "o.openid", StringUtils.trim(openid)) .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(cabinetId != null, "cc.cabinet_id", cabinetId)
.eq(status != null, "o.status", status) .eq(status != null, "o.status", status)
.eq(payStatus != null, "o.pay_status", payStatus) .eq(payStatus != null, "o.pay_status", payStatus)