From b016fddee0b3e915e66923383c7b8e89b0654229 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Thu, 29 Aug 2024 11:23:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=80=BE?= =?UTF-8?q?=E6=9C=9F=E6=9C=AA=E7=BB=93=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/shop/controller/OrderController.java | 11 ++++++----- src/main/java/com/gxwebsoft/shop/entity/Order.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java index c8fde53..96f512f 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java @@ -34,10 +34,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.math.BigDecimal; import java.net.URL; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -373,7 +370,11 @@ public class OrderController extends BaseController { //查询逾期订单 List overdueOrderList = orderService.lambdaQuery() .eq(Order::getUserId,loginUser.getUserId()) - .ne(Order::getOrderStatus,40)//过滤掉完结订单 + .eq(Order::getIsRenew,0)//过滤非续费订单，保持跟page接口一致 + .ne(Order::getOrderStatus,40)//过滤完结订单 + .eq(Order::getDeleted,0)//过滤未删除订单 + .ne(Order::getReceiptStatus,30)//不等于退租订单 + //.ge(Order::getCreateTime,DateUtil.offsetMonth(new Date(),-6))//最近三个6个月 .orderByDesc(Order::getCreateTime) .list(); if (overdueOrderList != null && !overdueOrderList.isEmpty()) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java index 4b2b0c6..033f58b 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Order.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -132,7 +132,7 @@ public class Order implements Serializable { @ApiModelProperty(value = "发货时间") private Date deliveryTime; - @ApiModelProperty(value = "收货状态(10未收货 20已收货)") + @ApiModelProperty(value = "收货状态(10未收货 20已收货，21退租中，30已退租)") private Integer receiptStatus; @ApiModelProperty(value = "收货时间")