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
816c15a2
Commit
816c15a2
authored
Mar 12, 2024
by
rui.zhu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/rui.zhu/付费会员卡系列优化-20240312' into develop
parents
8204300f
0abf889a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+1
-0
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
+1
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
816c15a2
...
@@ -987,6 +987,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -987,6 +987,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setRefundState
(
cancelOrderRequest
.
getRefundState
());
request
.
setRefundState
(
cancelOrderRequest
.
getRefundState
());
request
.
setRefundDeliveryAmount
(
cancelOrderRequest
.
isRefundDeliveryAmount
());
request
.
setRefundDeliveryAmount
(
cancelOrderRequest
.
isRefundDeliveryAmount
());
request
.
setPayRefundItemList
(
cancelOrderRequest
.
getPayRefundItemList
());
request
.
setPayRefundItemList
(
cancelOrderRequest
.
getPayRefundItemList
());
request
.
setReqAmount
(
cancelOrderRequest
.
getReqAmount
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
cancelOrder
(
request
,
cancelOrderRequest
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
cancelOrder
(
request
,
cancelOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
...
...
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
View file @
816c15a2
...
@@ -210,6 +210,7 @@ public class SaasOrderHandle {
...
@@ -210,6 +210,7 @@ public class SaasOrderHandle {
//作废订单
//作废订单
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
getCancelOrderRequest
(
request
.
getOperator
(),
request
.
getReason
(),
refundResponse
.
getPayRefundStatus
(),
refundResponse
.
getRefundId
(),
orderBean
);
CancelOrderRequest
cancelOrderRequest
=
orderSdkAdapter
.
getCancelOrderRequest
(
request
.
getOperator
(),
request
.
getReason
(),
refundResponse
.
getPayRefundStatus
(),
refundResponse
.
getRefundId
(),
orderBean
);
cancelOrderRequest
.
setOperationClient
(
request
.
getOperationClient
());
cancelOrderRequest
.
setOperationClient
(
request
.
getOperationClient
());
cancelOrderRequest
.
setReqAmount
(
refundResponse
.
getRefundAmount
());
List
<
OrderCancelReq
.
PayRefundItem
>
refundItemList
=
new
ArrayList
<>();
List
<
OrderCancelReq
.
PayRefundItem
>
refundItemList
=
new
ArrayList
<>();
if
(!
CollectionUtils
.
isEmpty
(
refundResponse
.
getPayRefundItemList
()))
{
if
(!
CollectionUtils
.
isEmpty
(
refundResponse
.
getPayRefundItemList
()))
{
...
...
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