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
14192c24
Commit
14192c24
authored
May 27, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拼团订单头部按钮
parent
0b6d4913
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 @
14192c24
...
@@ -4439,7 +4439,7 @@ public class OrderAdapter {
...
@@ -4439,7 +4439,7 @@ public class OrderAdapter {
boolean
orderCompareAfterSaleOrder
=
false
;
boolean
orderCompareAfterSaleOrder
=
false
;
//是否忽略售后单状态”呀,大部分情况都是false;只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
//是否忽略售后单状态”呀,大部分情况都是false;只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
AfterSalesOrderResp
afterSalesOrderResp
=
orderBean
.
getAfterSalesOrderResp
();
AfterSalesOrderResp
afterSalesOrderResp
=
orderBean
.
getAfterSalesOrderResp
();
if
(
null
!=
afterSalesOrderResp
&&
Objects
.
equals
(
AfterSalesStatus
.
REJECTED
.
getIndex
(),
afterSalesOrderResp
.
getAfterSalesStatus
())
&&
(
Objects
.
equals
(
AfterSalesStatus
.
CANCEL
.
getIndex
(),
afterSalesOrderResp
.
getAfterSalesStatus
())
|
Objects
.
equals
(
OrderStatus
.
RECEIPT
.
getCode
(),
orderBean
.
getStatus
())
||
Objects
.
equals
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
())
||
Objects
.
equals
(
OrderStatus
.
COMPLETE
.
getCode
(),
orderBean
.
getStatus
(
)))){
if
(
null
!=
afterSalesOrderResp
&&
(
Objects
.
equals
(
AfterSalesStatus
.
CANCEL
.
getIndex
(),
afterSalesOrderResp
.
getAfterSalesStatus
())
&&
Objects
.
equals
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
())
)
||
(
Objects
.
equals
(
AfterSalesStatus
.
REJECTED
.
getIndex
(),
afterSalesOrderResp
.
getAfterSalesStatus
())
&&
(
Objects
.
equals
(
OrderStatus
.
RECEIPT
.
getCode
(),
orderBean
.
getStatus
())
||
Objects
.
equals
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
())
||
Objects
.
equals
(
OrderStatus
.
COMPLETE
.
getCode
(),
orderBean
.
getStatus
()
)))){
orderCompareAfterSaleOrder
=
true
;
orderCompareAfterSaleOrder
=
true
;
}
}
return
orderCompareAfterSaleOrder
;
return
orderCompareAfterSaleOrder
;
...
...
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