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
2b94ebde
Commit
2b94ebde
authored
Jan 31, 2023
by
朱瑞
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/退款支持优化' into develop
parents
4ef04abd
ddf5b1e7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/CancelOrderRequestAdapter.java
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java
View file @
2b94ebde
...
@@ -84,7 +84,7 @@ public class CancelOrderRequest extends BaseConfig {
...
@@ -84,7 +84,7 @@ public class CancelOrderRequest extends BaseConfig {
* 是否部分退,默认否(全退)
* 是否部分退,默认否(全退)
*/
*/
@Builder
.
Default
@Builder
.
Default
private
b
oolean
isPartRefund
=
false
;
private
B
oolean
isPartRefund
=
false
;
//用户预约时间,仅为预约单时存放
//用户预约时间,仅为预约单时存放
private
String
expectTime
;
private
String
expectTime
;
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
2b94ebde
...
@@ -873,7 +873,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -873,7 +873,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setOrderCode
(
cancelOrderRequest
.
getOrderId
());
request
.
setOrderCode
(
cancelOrderRequest
.
getOrderId
());
request
.
setReqRemark
(
cancelOrderRequest
.
getReqRemark
());
request
.
setReqRemark
(
cancelOrderRequest
.
getReqRemark
());
request
.
setReqAmount
(
cancelOrderRequest
.
getReqAmount
());
request
.
setReqAmount
(
cancelOrderRequest
.
getReqAmount
());
request
.
set
PartRefund
(
cancelOrderRequest
.
i
sPartRefund
());
request
.
set
IsPartRefund
(
cancelOrderRequest
.
getI
sPartRefund
());
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
request
.
setAfterSalesType
(
cancelOrderRequest
.
getAfterSalesType
().
getIndex
()
==
null
?
1
:
cancelOrderRequest
.
getAfterSalesType
().
getIndex
());
request
.
setAfterSalesType
(
cancelOrderRequest
.
getAfterSalesType
().
getIndex
()
==
null
?
1
:
cancelOrderRequest
.
getAfterSalesType
().
getIndex
());
...
...
order-application-service/src/main/java/cn/freemud/adapter/CancelOrderRequestAdapter.java
View file @
2b94ebde
...
@@ -30,7 +30,7 @@ public class CancelOrderRequestAdapter {
...
@@ -30,7 +30,7 @@ public class CancelOrderRequestAdapter {
req
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
req
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
req
.
setRefundSerialNo
(
refundId
);
req
.
setRefundSerialNo
(
refundId
);
req
.
setPartRefund
(
refundAmount
!=
null
);
// 是否部分退
req
.
set
Is
PartRefund
(
refundAmount
!=
null
);
// 是否部分退
req
.
setReqAmount
(
refundAmount
!=
null
?
new
BigDecimal
(
refundAmount
)
:
null
);
// 退款金额
req
.
setReqAmount
(
refundAmount
!=
null
?
new
BigDecimal
(
refundAmount
)
:
null
);
// 退款金额
//操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
//操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
View file @
2b94ebde
...
@@ -96,5 +96,5 @@ public class OrderCancelReq {
...
@@ -96,5 +96,5 @@ public class OrderCancelReq {
/**
/**
* 是否部分退,默认否(全退)
* 是否部分退,默认否(全退)
*/
*/
private
b
oolean
isPartRefund
=
false
;
private
B
oolean
isPartRefund
=
false
;
}
}
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