From 7d713ee9213f4c4c88fbbea73a4e36c0b7801c92 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 25 Aug 2021 16:05:36 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
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