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
4c289a58
Commit
4c289a58
authored
Jul 19, 2023
by
rui.zhu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/rui.zhu/关单逻辑优化' into qa
parents
e97b047c
7a63c984
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
7 deletions
+1
-7
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
+1
-7
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
View file @
4c289a58
...
@@ -146,10 +146,6 @@ public class OrderAdapterServiceImpl {
...
@@ -146,10 +146,6 @@ public class OrderAdapterServiceImpl {
private
OrderCommonService
orderCommonService
;
private
OrderCommonService
orderCommonService
;
@Autowired
@Autowired
private
SellCouponOrderServiceImpl
sellCouponOrderService
;
private
SellCouponOrderServiceImpl
sellCouponOrderService
;
@Value
(
"${saas.autoRefund.client}"
)
private
String
autoRefundClient
;
@Value
(
"${saas.autoRefund.partnerId}"
)
private
String
autoRefundPartnerId
;
@Autowired
@Autowired
private
OrderCenterProperties
orderCenterProperties
;
private
OrderCenterProperties
orderCenterProperties
;
@Autowired
@Autowired
...
@@ -340,9 +336,7 @@ public class OrderAdapterServiceImpl {
...
@@ -340,9 +336,7 @@ public class OrderAdapterServiceImpl {
}
}
Integer
client
=
Integer
.
parseInt
(
orderBean
.
getOrderClient
());
Integer
client
=
Integer
.
parseInt
(
orderBean
.
getOrderClient
());
//若是订单超时回调了 订单已取消则做退款处理
//若是订单超时回调了 订单已取消则做退款处理
if
(
NewOrderStatus
.
CLOSED
.
getIndex
().
equals
(
orderBean
.
getStatusV2
())
if
(
NewOrderStatus
.
CLOSED
.
getIndex
().
equals
(
orderBean
.
getStatusV2
()))
{
&&
Arrays
.
asList
(
autoRefundClient
.
split
(
","
)).
contains
(
client
.
toString
())
&&
Arrays
.
asList
(
autoRefundPartnerId
.
split
(
","
)).
contains
(
orderBean
.
getCompanyId
()))
{
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
order
.
OrderManagerRequest
request
=
new
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
order
.
OrderManagerRequest
();
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
order
.
OrderManagerRequest
request
=
new
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
order
.
OrderManagerRequest
();
request
.
setOrderId
(
orderBean
.
getOid
());
request
.
setOrderId
(
orderBean
.
getOid
());
request
.
setPartnerId
(
orderBean
.
getCompanyId
());
request
.
setPartnerId
(
orderBean
.
getCompanyId
());
...
...
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