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
1903cdc0
Commit
1903cdc0
authored
May 10, 2021
by
王世昌
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20210414_华莱士微商城申请退款_wangshichang' into feature/20210420-华莱士公用分支-张志恒
parents
e58450f2
da61e766
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+8
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
View file @
1903cdc0
...
@@ -35,6 +35,7 @@ import java.util.List;
...
@@ -35,6 +35,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.function.Function
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
/**
* All rights Reserved, Designed By www.freemud.cn
* All rights Reserved, Designed By www.freemud.cn
...
@@ -469,6 +470,13 @@ public class OrderVerifyHandle {
...
@@ -469,6 +470,13 @@ public class OrderVerifyHandle {
*/
*/
private
boolean
getRefundConfig
(
QueryOrdersResponse
.
DataBean
.
OrderBean
data
)
{
private
boolean
getRefundConfig
(
QueryOrdersResponse
.
DataBean
.
OrderBean
data
)
{
boolean
isFinishRefund
=
false
;
boolean
isFinishRefund
=
false
;
// [华莱士20210410] 微商城订单判断
if
(
Objects
.
equals
(
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
enums
.
OrderSourceType
.
SAASMALL
.
getCode
(),
data
.
getSource
())
){
// 除 未支付 拒单 和 取消外,其他可退款
return
Stream
.
of
(
OrderStatus
.
WAIT_PAY
,
OrderStatus
.
REFUSE
,
OrderStatus
.
CANCEL
).
noneMatch
(
s
->
Objects
.
equals
(
data
.
getStatus
(),
s
.
getCode
()));
}
boolean
canRefund
=
false
;
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
.
OrderExtInfoDto
extInfo
=
null
;
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
.
OrderExtInfoDto
extInfo
=
null
;
JSONObject
jsonObject1
=
JSONObject
.
parseObject
(
data
.
getExtInfo
());
JSONObject
jsonObject1
=
JSONObject
.
parseObject
(
data
.
getExtInfo
());
extInfo
=
jsonObject1
.
toJavaObject
(
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
.
OrderExtInfoDto
.
class
);
extInfo
=
jsonObject1
.
toJavaObject
(
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
.
OrderExtInfoDto
.
class
);
...
...
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