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
2d8dc2f9
Commit
2d8dc2f9
authored
Mar 08, 2021
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
针对美业修改下单成功文案
parent
554851de
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+16
-4
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
2d8dc2f9
...
...
@@ -1616,7 +1616,7 @@ public class OrderAdapter {
if
(
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
if
(
refundBean
==
null
||
RefundStatus
.
REFUSE_REFUND
.
getCode
().
equals
(
refundBean
.
getStatus
()))
{
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
TAKE_ORDER
.
getCode
());
orderViewStatusDto
.
setOrderStatusDesc
(
"下单成功"
);
orderViewStatusDto
.
setOrderStatusDesc
(
conventCreateOrderString
(
orderBean
)
);
orderViewStatusDto
.
setOrderStatusDescText
(
"目前有"
+
orderBean
.
getQueueIndex
()
+
"人在排队,凭此页到店领取哦~"
);
if
(
StringUtils
.
isBlank
(
orderBean
.
getQueueIndex
())
||
"0"
.
equals
(
orderBean
.
getQueueIndex
()))
{
orderViewStatusDto
.
setOrderStatusDescText
(
"凭此页到店领取哦~"
);
...
...
@@ -1731,7 +1731,7 @@ public class OrderAdapter {
orderViewStatusDto
.
setButtonContactPartner
(
true
);
}
else
{
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
RECEIPT
.
getCode
());
orderViewStatusDto
.
setOrderStatusDesc
(
"制作中"
);
orderViewStatusDto
.
setOrderStatusDesc
(
conventProduceString
(
orderBean
)
);
orderViewStatusDto
.
setOrderStatusDescText
(
"请稍等片刻,美味即将到达哦~"
);
orderViewStatusDto
.
setRiderName
(
StringUtils
.
isEmpty
(
orderBean
.
getRiderName
())
?
"处理中"
:
orderBean
.
getRiderName
());
orderViewStatusDto
.
setRiderText
(
StringUtils
.
isEmpty
(
orderBean
.
getRiderName
())
?
"正在为您匹配配送员"
:
"配送员"
);
...
...
@@ -4050,14 +4050,26 @@ public class OrderAdapter {
/**
* 转换制作中的文案,美业用
下单成功
,其他用制作中
* 转换制作中的文案,美业用
待使用
,其他用制作中
* @param orderBean
* @return
*/
public
String
conventProduceString
(
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
if
(
String
.
valueOf
(
OrderClientType
.
BEAUTIFUL
.
getIndex
()).
equals
(
orderBean
.
getOrderClient
())){
return
"
下单成功
"
;
return
"
待使用
"
;
}
return
"制作中"
;
}
/**
* 转换待使用的文案,美业用待使用,其他用制作中
* @param orderBean
* @return
*/
public
String
conventCreateOrderString
(
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
if
(
String
.
valueOf
(
OrderClientType
.
BEAUTIFUL
.
getIndex
()).
equals
(
orderBean
.
getOrderClient
())){
return
"待使用"
;
}
return
"下单成功"
;
}
}
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