From 78018fe289cd8e2cec1778030a3bf65512b5837c Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Tue, 24 Apr 2018 15:06:39 +0800
Subject: [PATCH] =?UTF-8?q?update[litemall-db]:=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E6=98=AF103=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E5=B7=B2=E5=8F=96=E6=B6=88=EF=BC=88?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=89=E2=80=9D=EF=BC=8C=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=AF=E7=B3=BB=E7=BB=9F=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linlinjava/litemall/db/util/OrderUtil.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java
index 4d3ac09f..d17a3d47 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java
@@ -41,10 +41,14 @@ public class OrderUtil {
             return "未付款";
         }
 
-        if (status == 102 || status == 103) {
+        if (status == 102) {
             return "已取消";
         }
 
+        if (status == 103) {
+            return "已取消(系统)";
+        }
+
         if (status == 201) {
             return "已付款";
         }
@@ -66,8 +70,7 @@ public class OrderUtil {
             return "已收货(系统)";
         }
 
-        Assert.state(false, "orderStatus不支持");
-        return "";
+        throw new IllegalStateException("orderStatus不支持");
     }
 
 
@@ -105,10 +108,8 @@ public class OrderUtil {
             handleOption.setComment(true);
             handleOption.setRebuy(true);
         }
-        else {
-            Assert.state(false, "status不支持");
-        }
-        return handleOption;
+
+        throw new IllegalStateException("status不支持");
     }
 
     public static List<Short> orderStatus(Integer showType){
@@ -137,8 +138,9 @@ public class OrderUtil {
             status.add((short)401);
         }
         else {
-            Assert.state(false, "showType不支持");
+            return null;
         }
+
         return status;
     }