Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
78018fe2
Commit
78018fe2
authored
Apr 24, 2018
by
Junling Bu
Browse files
update[litemall-db]: 订单状态码是103时,显示“已取消(系统)”,表面订单是系统取消。
parent
87e5c3a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java
View file @
78018fe2
...
...
@@ -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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment