From 94e92856f90d2a1c11948db4af794d7ec72ce74a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 Aug 2021 16:25:22 +0800
Subject: [PATCH] 20210818
---
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
index fafab47..20d7f4b 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
@@ -16,7 +16,7 @@
@ApiModelProperty(value="客户姓名")
private String name;
- @ApiModelProperty(value="排序字段 1：客户名称 2：下单时间")
+ @ApiModelProperty(value="排序字段 1：下单时间 2：客户名称")
private Integer namePx;
@ApiModelProperty(value="排序方式 1： asc , 2 ：aesc")
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index dd4d79c..3796928 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -65,9 +65,10 @@
String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
String orderNo = model.getOrderNo();
List<Integer> status = new ArrayList<>();
- if(CollUtil.isNotEmpty(status)){
+ if(CollUtil.isNotEmpty(model.getStatus())){
status = model.getStatus();
- }else{
+ }
+ if(CollUtil.isEmpty(model.getStatus())){
status.add(1);
status.add(2);
status.add(3);
--
Gitblit v1.9.1