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
49a58785
Commit
49a58785
authored
Apr 24, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
制作完成匹配订单状态错误修改
parent
731cade8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
49a58785
...
@@ -1311,7 +1311,7 @@ public class OrderAdapter {
...
@@ -1311,7 +1311,7 @@ public class OrderAdapter {
orderViewStatusDto
.
setButtonRefund
(
checkRefundButton
(
orderBean
,
wxAppId
));
orderViewStatusDto
.
setButtonRefund
(
checkRefundButton
(
orderBean
,
wxAppId
));
}
}
if
(
refundBean
==
null
||
RefundStatus
.
REFUSE_REFUND
.
getCode
().
equals
(
refundBean
.
getStatus
()))
{
if
(
refundBean
==
null
||
RefundStatus
.
REFUSE_REFUND
.
getCode
().
equals
(
refundBean
.
getStatus
()))
{
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
TAKE_ORDER
.
getCode
());
orderViewStatusDto
.
setOrderStatus
(
OrderStatus
.
COMPLETE_MAKE
.
getCode
());
orderViewStatusDto
.
setOrderStatusDesc
(
"待取餐"
);
orderViewStatusDto
.
setOrderStatusDesc
(
"待取餐"
);
orderViewStatusDto
.
setOrderStatusDescText
(
"目前有"
+
orderBean
.
getQueueIndex
()
+
"人在排队,凭此页到店领取哦~"
);
orderViewStatusDto
.
setOrderStatusDescText
(
"目前有"
+
orderBean
.
getQueueIndex
()
+
"人在排队,凭此页到店领取哦~"
);
if
(
StringUtils
.
isBlank
(
orderBean
.
getQueueIndex
())
||
"0"
.
equals
(
orderBean
.
getQueueIndex
()))
{
if
(
StringUtils
.
isBlank
(
orderBean
.
getQueueIndex
())
||
"0"
.
equals
(
orderBean
.
getQueueIndex
()))
{
...
...
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