Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
ad1ca083
Commit
ad1ca083
authored
May 25, 2020
by
dingkai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送状态-1处理
parent
5cb8e634
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-1
order-application-service/src/main/java/cn/freemud/enums/DeliverStatus.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
ad1ca083
...
@@ -1460,7 +1460,8 @@ public class OrderAdapter {
...
@@ -1460,7 +1460,8 @@ public class OrderAdapter {
}
}
//TODO 判断配送中的逻辑 如果是有第三方配送,要查询第三方配送信息,显示骑手信息 如果有骑手信息 显示 联系骑手
//TODO 判断配送中的逻辑 如果是有第三方配送,要查询第三方配送信息,显示骑手信息 如果有骑手信息 显示 联系骑手
if
(
OrderStatus
.
DISTRIBUTION
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
if
(
OrderStatus
.
DISTRIBUTION
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
if
(
orderBean
.
getDeliverStatus
()
==
null
||
DeliverStatus
.
OTHER
.
getCode
().
equals
(
orderBean
.
getDeliverStatus
()))
{
if
(
orderBean
.
getDeliverStatus
()
==
null
||
DeliverStatus
.
OTHER
.
getCode
().
equals
(
orderBean
.
getDeliverStatus
())
||
DeliverStatus
.
DELIVER_OTHER
.
getCode
().
equals
(
orderBean
.
getDeliverStatus
()))
{
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
DISTRIBUTION
.
getCode
());
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
DISTRIBUTION
.
getCode
());
orderViewStatusDto
.
setOrderStatusDesc
(
"配送中"
);
orderViewStatusDto
.
setOrderStatusDesc
(
"配送中"
);
orderViewStatusDto
.
setOrderStatusDescText
(
"请稍等片刻,美味即将到达哦~"
);
orderViewStatusDto
.
setOrderStatusDescText
(
"请稍等片刻,美味即将到达哦~"
);
...
...
order-application-service/src/main/java/cn/freemud/enums/DeliverStatus.java
View file @
ad1ca083
...
@@ -14,6 +14,7 @@ package cn.freemud.enums;
...
@@ -14,6 +14,7 @@ package cn.freemud.enums;
*/
*/
public
enum
DeliverStatus
{
public
enum
DeliverStatus
{
DELIVER_OTHER
(-
1
,
"未处理"
),
OTHER
(-
2
,
"未处理"
),
OTHER
(-
2
,
"未处理"
),
WATINGORDER
(
0
,
"待接单"
),
WATINGORDER
(
0
,
"待接单"
),
SYSTEMGETORDER
(
1
,
"系统接单"
),
SYSTEMGETORDER
(
1
,
"系统接单"
),
...
...
Write
Preview
Markdown
is supported
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