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
5363ee39
Commit
5363ee39
authored
Dec 02, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
餐道主动退款原因
parent
6c40a8aa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
0 deletions
+16
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+1
-0
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/MacCafeCallbackUrlRequestDto.java
+9
-0
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
+5
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
5363ee39
...
@@ -115,6 +115,7 @@ public class OrderSdkAdapter {
...
@@ -115,6 +115,7 @@ public class OrderSdkAdapter {
//退款状态为退款完成:event为4,默认做【创建】+【同意并退款完成】,售后单状态为【完成】
//退款状态为退款完成:event为4,默认做【创建】+【同意并退款完成】,售后单状态为【完成】
var1
.
setCreateEvent
(
PayRefundStatus
.
SUCCESS
.
equals
(
refundStatus
)
?
AfterSalesOrderCreateEventEnum
.
REFUND_COMPLETE
.
getCreateEvent
()
:
AfterSalesOrderCreateEventEnum
.
RETURN_COMPLETE
.
getCreateEvent
());
var1
.
setCreateEvent
(
PayRefundStatus
.
SUCCESS
.
equals
(
refundStatus
)
?
AfterSalesOrderCreateEventEnum
.
REFUND_COMPLETE
.
getCreateEvent
()
:
AfterSalesOrderCreateEventEnum
.
RETURN_COMPLETE
.
getCreateEvent
());
var1
.
setOperator
(
operator
);
var1
.
setOperator
(
operator
);
var1
.
setReason
(
reason
);
return
var1
;
return
var1
;
}
}
public
CancelOrderRequest
getRejectRefundRequest
(
String
operator
,
String
reason
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
){
public
CancelOrderRequest
getRejectRefundRequest
(
String
operator
,
String
reason
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
){
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
5363ee39
...
@@ -533,6 +533,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -533,6 +533,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setOrderCode
(
orderRefundRequest
.
getOrderId
());
request
.
setOrderCode
(
orderRefundRequest
.
getOrderId
());
request
.
setReqRemark
(
orderRefundRequest
.
getRemark
());
request
.
setReqRemark
(
orderRefundRequest
.
getRemark
());
request
.
setAfterSalesReason
(
orderRefundRequest
.
getReason
());
request
.
setAfterSalesReason
(
orderRefundRequest
.
getReason
());
request
.
setCancelReason
(
orderRefundRequest
.
getReason
());
request
.
setOperator
(
orderRefundRequest
.
getOperator
());
request
.
setOperator
(
orderRefundRequest
.
getOperator
());
if
(
null
!=
orderRefundRequest
.
getCreateEvent
())
{
if
(
null
!=
orderRefundRequest
.
getCreateEvent
())
{
request
.
setCreateEvent
(
orderRefundRequest
.
getCreateEvent
());
request
.
setCreateEvent
(
orderRefundRequest
.
getCreateEvent
());
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/MacCafeCallbackUrlRequestDto.java
View file @
5363ee39
...
@@ -74,4 +74,13 @@ public class MacCafeCallbackUrlRequestDto {
...
@@ -74,4 +74,13 @@ public class MacCafeCallbackUrlRequestDto {
*/
*/
private
Integer
reviewStatus
;
private
Integer
reviewStatus
;
/**
* 取消原因
*/
private
String
cancelReason
;
/**
* 退款发起方,0用户 1餐道
*/
private
Integer
cancelApplicant
;
}
}
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
View file @
5363ee39
...
@@ -170,6 +170,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
...
@@ -170,6 +170,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
OrderManagerRequest
orderManagerRequest
=
new
OrderManagerRequest
();
OrderManagerRequest
orderManagerRequest
=
new
OrderManagerRequest
();
orderManagerRequest
.
setPartnerId
(
request
.
getPartnerId
());
orderManagerRequest
.
setPartnerId
(
request
.
getPartnerId
());
orderManagerRequest
.
setOrderId
(
request
.
getOrderId
());
orderManagerRequest
.
setOrderId
(
request
.
getOrderId
());
if
(
"1"
.
equals
(
request
.
getCancelApplicant
()))
{
orderManagerRequest
.
setReason
(
StringUtils
.
isNotBlank
(
request
.
getCancelReason
())?
request
.
getCancelReason
():
"餐道主动取消"
);
}
else
{
orderManagerRequest
.
setReason
(
null
);
}
orderManagerRequest
.
setOperator
(
"配送回调"
);
orderManagerRequest
.
setOperator
(
"配送回调"
);
...
...
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