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

feat(查询): 添加处理状态和搜索字段以增强退货审批查询功能 

在SearchApiReturnApprovalQuery中添加handleStatus和searchStr字段，并实现相关查询逻辑：
1. 根据handleStatus筛选未处理(0)或已处理(1)的审批
2. 支持通过searchStr模糊匹配订单名称或商品名称
3. 保持原有查询条件不变的情况下扩展功能
This commit is contained in:
dzq 2025-06-21 10:42:55 +08:00
parent 0ac7911ea5
commit de166f62d1
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java
View File

@ -16,6 +16,9 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
private Long goodsId;
private String goodsName;
private Integer status;
// 0:未处理 1:已处理
private Integer handleStatus;
private String searchStr;
private Long externalGoodsId;
private Long externalApprovalId;
private String code;
@ -36,6 +39,20 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
public QueryWrapper<T> addQueryCondition() {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
if (status == null && handleStatus != null) {
if (handleStatus == 0) {
queryWrapper.and(wrapper ->
wrapper.eq("ra.status", 1)
.or()
.eq("ra.status", 4));
} else if (handleStatus == 1) {
queryWrapper.and(wrapper ->
wrapper.eq("ra.status", 2)
.or()
.eq("ra.status", 3));
}
}
queryWrapper
.eq(approvalId != null, "ra.approval_id", approvalId)
.eq(orderId != null, "ra.order_id", orderId)
@ -51,8 +68,16 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
.eq(StrUtil.isNotEmpty(applyUserName), "ra.apply_user_name", applyUserName)
.eq(StrUtil.isNotEmpty(auditUserid), "ra.audit_userid", auditUserid)
.like(StrUtil.isNotEmpty(goodsName), "sog.goods_name", goodsName)
.between(startTime != null && endTime != null, "ra.create_time", startTime, endTime)
.orderByDesc("ra.approval_id");
.between(startTime != null && endTime != null, "ra.create_time", startTime, endTime);
if (StrUtil.isNotEmpty(searchStr)) {
queryWrapper.and(wrapper ->
wrapper.like("so.name", searchStr)
.or()
.like("sog.goods_name", searchStr));
}
queryWrapper.orderByDesc("ra.approval_id");
this.timeRangeColumn = "create_time";