gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：订单逾期未结判断修改

Browse Source
This commit is contained in:
yangqingyuan
2024-08-29 11:23:15 +08:00
parent 512c88155d
commit b016fddee0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gxwebsoft/shop/controller/OrderController.java
View File

@@ -34,10 +34,7 @@ import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URL; import java.net.URL;
import java.util.HashSet; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -373,7 +370,11 @@ public class OrderController extends BaseController {
//查询逾期订单 //查询逾期订单
List<Order> overdueOrderList = orderService.lambdaQuery() List<Order> overdueOrderList = orderService.lambdaQuery()
.eq(Order::getUserId,loginUser.getUserId()) .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) .orderByDesc(Order::getCreateTime)
.list(); .list();
if (overdueOrderList != null && !overdueOrderList.isEmpty()) { if (overdueOrderList != null && !overdueOrderList.isEmpty()) {

2
src/main/java/com/gxwebsoft/shop/entity/Order.java
View File

@@ -132,7 +132,7 @@ public class Order implements Serializable {
@ApiModelProperty(value = "发货时间") @ApiModelProperty(value = "发货时间")
private Date deliveryTime; private Date deliveryTime;
@ApiModelProperty(value = "收货状态(10未收货 20已收货)") @ApiModelProperty(value = "收货状态(10未收货 20已收货，21退租中，30已退租)")
private Integer receiptStatus; private Integer receiptStatus;
@ApiModelProperty(value = "收货时间") @ApiModelProperty(value = "收货时间")