From 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 16:16:24 +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/controller/AdminOrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index e0cc117..1c6c463 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -117,10 +117,10 @@
if(ObjectUtil.isEmpty(scoreOrder)){
return JsonResult.failMessage("订单不存在！");
}
- Integer status = scoreOrder.getStatus();
- if(ScoreOrder.STATUS_DOING != status){
- return JsonResult.failMessage("当前订单不是已收货状态！");
- }
+// Integer status = scoreOrder.getStatus();
+// if(ScoreOrder.STATUS_DOING != status){
+// return JsonResult.failMessage("当前订单不是已收货状态！");
+// }
List<String> voucherImgs = model.getVoucherImgs();
if(CollUtil.isEmpty(voucherImgs)){
return JsonResult.failMessage("凭证不能为空！");
--
Gitblit v1.9.1