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
3e5a627a
Commit
3e5a627a
authored
May 11, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sdk 升级
parent
3012c6dc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
27 deletions
+20
-27
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
+6
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+13
-0
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
+1
-27
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
View file @
3e5a627a
...
@@ -380,4 +380,10 @@ public interface OrderCenterSdkService {
...
@@ -380,4 +380,10 @@ public interface OrderCenterSdkService {
*/
*/
BaseOrderResponse
editAfterSalesExpress
(
EditAfterSalesExpressRequest
afterSalesExpressRequest
);
BaseOrderResponse
editAfterSalesExpress
(
EditAfterSalesExpressRequest
afterSalesExpressRequest
);
/**
* 订单拒绝退款 POS
*/
BaseOrderResponse
mallOrderRefundReject
(
CancelOrderRequest
cancelOrderRequest
);
}
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
3e5a627a
...
@@ -2098,4 +2098,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -2098,4 +2098,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
adultGoodsReturned
(
request
,
afterSalesExpressRequest
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
adultGoodsReturned
(
request
,
afterSalesExpressRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
@Override
public
BaseOrderResponse
mallOrderRefundReject
(
CancelOrderRequest
cancelOrderRequest
)
{
AfterSalesOperateReq
request
=
new
AfterSalesOperateReq
();
request
.
setOrderClient
(
OrderClientType
.
SAASMALL
.
getIndex
());
request
.
setPartnerId
(
cancelOrderRequest
.
getPartnerId
());
request
.
setOrderCode
(
cancelOrderRequest
.
getOrderId
());
request
.
setAfterSalesCode
(
cancelOrderRequest
.
getAfterSalesCode
());
request
.
setAdultRemark
(
cancelOrderRequest
.
getReason
());
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
adultReject
(
request
,
cancelOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
}
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
View file @
3e5a627a
...
@@ -85,32 +85,6 @@ public class MallOrderHandle {
...
@@ -85,32 +85,6 @@ public class MallOrderHandle {
}
}
/**
/**
* 麦咖啡拒绝退款
* @param request
* @param orderBean
* @return
*/
public
BaseResponse
mcCafeRefundReject
(
OrderManagerRequest
request
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
BaseOrderResponse
baseOrderResponse
=
null
;
for
(
int
i
=
0
;
i
<
orderBean
.
getRefundList
().
size
();
i
++)
{
if
(
RefundStatus
.
APPLY_REFUND
.
getCode
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
rejectRefundRequest
.
setAfterSalesCode
(
orderBean
.
getRefundList
().
get
(
i
).
getRid
());
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
}
if
(
RefundStatus
.
COMPLETE_REFUND
.
getCode
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
baseOrderResponse
=
new
BaseOrderResponse
();
baseOrderResponse
.
setErrcode
(
100
);
baseOrderResponse
.
setErrmsg
(
"success"
);
}
}
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
}
return
ResponseUtil
.
success
();
}
/**
* 同意退款
* 同意退款
*
*
* @param request
* @param request
...
@@ -119,7 +93,7 @@ public class MallOrderHandle {
...
@@ -119,7 +93,7 @@ public class MallOrderHandle {
*/
*/
public
BaseResponse
mallOrderAgreeApply
(
OrderManagerRequest
request
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
public
BaseResponse
mallOrderAgreeApply
(
OrderManagerRequest
request
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
BaseQueryOrderRequest
refundAgreeRequest
=
orderSdkAdapter
.
getRefundAgreeRequest
(
""
,
request
.
getReason
(),
request
.
getOperator
(),
orderBean
);
BaseQueryOrderRequest
refundAgreeRequest
=
orderSdkAdapter
.
getRefundAgreeRequest
(
""
,
request
.
getReason
(),
request
.
getOperator
(),
orderBean
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrder
AgreeApply
(
refundAgreeRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrder
RefundReject
(
refundAgreeRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
AGREE_REFUND_APPLY_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
AGREE_REFUND_APPLY_ORDER_FAIL
);
}
}
...
...
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