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
f4dbdc7e
Commit
f4dbdc7e
authored
May 25, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拒单
parent
d207322c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
4 deletions
+31
-4
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
+4
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+23
-0
order-management/pom.xml
+1
-1
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
+2
-2
order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
View file @
f4dbdc7e
...
@@ -391,4 +391,8 @@ public interface OrderCenterSdkService {
...
@@ -391,4 +391,8 @@ public interface OrderCenterSdkService {
BaseOrderResponse
mallOrderRefundReject
(
CancelOrderRequest
cancelOrderRequest
);
BaseOrderResponse
mallOrderRefundReject
(
CancelOrderRequest
cancelOrderRequest
);
/**
* 订单POS拒单 POS
*/
BaseOrderResponse
mallOrderReject
(
CancelOrderRequest
cancelOrderRequest
);
}
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
f4dbdc7e
...
@@ -2139,4 +2139,27 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -2139,4 +2139,27 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
adultReject
(
request
,
cancelOrderRequest
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
adultReject
(
request
,
cancelOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
/**
* 订单POS拒单 POS
*/
@Override
public
BaseOrderResponse
mallOrderReject
(
CancelOrderRequest
cancelOrderRequest
)
{
OrderCancelReq
request
=
new
OrderCancelReq
();
//商户号必传
request
.
setPartnerId
(
cancelOrderRequest
.
getPartnerId
());
request
.
setOrderCode
(
cancelOrderRequest
.
getOrderId
());
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
request
.
setAfterSalesType
(
cancelOrderRequest
.
getAfterSalesType
().
getIndex
()
==
null
?
1
:
cancelOrderRequest
.
getAfterSalesType
().
getIndex
());
request
.
setOrderClient
(
OrderClientType
.
SAASMALL
.
getIndex
());
request
.
setCancelReason
(
cancelOrderRequest
.
getReason
());
//若为4,默认做【创建】+【同意并退款完成】,售后单状态为【完成】
request
.
setCreateEvent
(
4
);
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
request
.
setAfterSerialNo
(
cancelOrderRequest
.
getRefundSerialNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
response
=
orderSdkService
.
cancelOrder
(
request
,
cancelOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
}
order-management/pom.xml
View file @
f4dbdc7e
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.1.6
3
-RELEASE
</version>
<version>
2.1.6
4
-RELEASE
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
View file @
f4dbdc7e
...
@@ -126,10 +126,10 @@ public class MallOrderHandle {
...
@@ -126,10 +126,10 @@ public class MallOrderHandle {
* @param orderBean
* @param orderBean
* @return
* @return
*/
*/
public
BaseResponse
o
rderReject
(
OrderManagerRequest
request
,
PayRefundResponse
refundResponse
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
public
BaseResponse
mallO
rderReject
(
OrderManagerRequest
request
,
PayRefundResponse
refundResponse
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
)
{
//作废订单
//作废订单
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
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
o
rderReject
(
cancelOrderRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallO
rderReject
(
cancelOrderRequest
);
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
.
AFFIRM_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
AFFIRM_ORDER_FAIL
);
}
}
...
...
order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java
View file @
f4dbdc7e
...
@@ -146,7 +146,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
...
@@ -146,7 +146,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
return
ResponseUtil
.
error
(
orderEx
.
getResult
());
return
ResponseUtil
.
error
(
orderEx
.
getResult
());
}
}
//订单拒单
//订单拒单
mallOrderHandle
.
o
rderReject
(
request
,
refundResponse
,
orderBean
);
mallOrderHandle
.
mallO
rderReject
(
request
,
refundResponse
,
orderBean
);
// 推送pos、微信消息中心
// 推送pos、微信消息中心
orderBaseService
.
sendMessage
(
orderBean
,
OperateType
.
ORDER_REJECT
,
request
.
getReason
());
orderBaseService
.
sendMessage
(
orderBean
,
OperateType
.
ORDER_REJECT
,
request
.
getReason
());
//todo 可以考虑基于订单回调异步实现
//todo 可以考虑基于订单回调异步实现
...
...
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