From feda6b70c8381453bab437d73341b1e7dd60bf10 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 11:00:11 +0800
Subject: [PATCH] 20211108

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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