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 orderStatus(Integer showType){ @@ -137,8 +138,9 @@ public class OrderUtil { status.add((short)401); } else { - Assert.state(false, "showType不支持"); + return null; } + return status; }