Commit 78018fe2 authored by Junling Bu's avatar Junling Bu
Browse files

update[litemall-db]: 订单状态码是103时,显示“已取消(系统)”,表面订单是系统取消。

parent 87e5c3a7
...@@ -41,10 +41,14 @@ public class OrderUtil { ...@@ -41,10 +41,14 @@ public class OrderUtil {
return "未付款"; return "未付款";
} }
if (status == 102 || status == 103) { if (status == 102) {
return "已取消"; return "已取消";
} }
if (status == 103) {
return "已取消(系统)";
}
if (status == 201) { if (status == 201) {
return "已付款"; return "已付款";
} }
...@@ -66,8 +70,7 @@ public class OrderUtil { ...@@ -66,8 +70,7 @@ public class OrderUtil {
return "已收货(系统)"; return "已收货(系统)";
} }
Assert.state(false, "orderStatus不支持"); throw new IllegalStateException("orderStatus不支持");
return "";
} }
...@@ -105,10 +108,8 @@ public class OrderUtil { ...@@ -105,10 +108,8 @@ public class OrderUtil {
handleOption.setComment(true); handleOption.setComment(true);
handleOption.setRebuy(true); handleOption.setRebuy(true);
} }
else {
Assert.state(false, "status不支持"); throw new IllegalStateException("status不支持");
}
return handleOption;
} }
public static List<Short> orderStatus(Integer showType){ public static List<Short> orderStatus(Integer showType){
...@@ -137,8 +138,9 @@ public class OrderUtil { ...@@ -137,8 +138,9 @@ public class OrderUtil {
status.add((short)401); status.add((short)401);
} }
else { else {
Assert.state(false, "showType不支持"); return null;
} }
return status; return status;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment