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
f9311a88
Commit
f9311a88
authored
Aug 26, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
联调,暂时不退钱
parent
fa31ab87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+9
-11
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
f9311a88
...
@@ -952,9 +952,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -952,9 +952,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
}
CreateDeliveryVo
createDeliveryVo
=
deliveryAdapter
.
buildDeliveryOrderRequestDto
(
orderBean
,
storeInfo
,
deliveryCallBackUrl
,
linkedHashMap
.
get
(
"downstreamThirdOrderCode"
));
CreateDeliveryVo
createDeliveryVo
=
deliveryAdapter
.
buildDeliveryOrderRequestDto
(
orderBean
,
storeInfo
,
deliveryCallBackUrl
,
linkedHashMap
.
get
(
"downstreamThirdOrderCode"
));
//创建配送单
//创建配送单
//暂时写死配送店铺id
createDeliveryVo
.
setStoreId
(
"1450026"
);
createDeliveryVo
.
setStoreCode
(
"1450026"
);
CreateDeliveryOrderResponseDto
deliveryResponse
=
deliveryFeiginClient
.
deliveryOrderAdd
(
createDeliveryVo
);
CreateDeliveryOrderResponseDto
deliveryResponse
=
deliveryFeiginClient
.
deliveryOrderAdd
(
createDeliveryVo
);
//创建配送单失败,更新订单为异常单
//创建配送单失败,更新订单为异常单
if
(
deliveryResponse
==
null
||
RESPONSE_SUCCESS_CODE
!=
deliveryResponse
.
getCode
()
||
deliveryResponse
.
getData
()
==
null
)
{
if
(
deliveryResponse
==
null
||
RESPONSE_SUCCESS_CODE
!=
deliveryResponse
.
getCode
()
||
deliveryResponse
.
getData
()
==
null
)
{
...
@@ -1152,14 +1149,15 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1152,14 +1149,15 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if
(
orderBean
.
getAmount
()
!=
0
)
{
if
(
orderBean
.
getAmount
()
!=
0
)
{
//调用支付退款
//调用支付退款
com
.
freemud
.
sdk
.
api
.
assortment
.
payment
.
request
.
OrderRefundRequest
orderPayRefundRequest
=
orderAdapter
.
getOrderPayRefundRequest
(
orderBean
,
refundId
,
fatherOrderId
);
// com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
orderPayRefundRequest
.
setRefundAmount
(
1
l
);
// orderPayRefundRequest.setRefundAmount(1l);
response
=
standardPaymentService
.
orderRefund
(
orderPayRefundRequest
,
LogTreadLocal
.
getTrackingNo
());
// response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
if
(
response
==
null
||
response
.
getData
()
==
null
||
!
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
domain
.
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
.
equals
(
response
.
getCode
()))
{
// if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"orderRefund_failed"
);
// return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
}
// }
//获取支付返回退款状态
// //获取支付返回退款状态
state
=
response
.
getData
().
getRefundStatus
()
==
null
?
PayRefundStatus
.
SUCCESS
.
getCode
()
:
response
.
getData
().
getRefundStatus
();
// state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
state
=
PayRefundStatus
.
SUCCESS
.
getCode
();
}
}
CancelOrderRequest
cancelOrderRequest
=
orderAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
CancelOrderRequest
cancelOrderRequest
=
orderAdapter
.
convent2CancelOrderRequest
(
orderBean
.
getOid
(),
partnerId
,
afterSalesType
,
orderRefundVo
.
getReason
(),
LogTreadLocal
.
getTrackingNo
(),
refundId
.
toString
());
partnerId
,
afterSalesType
,
orderRefundVo
.
getReason
(),
LogTreadLocal
.
getTrackingNo
(),
refundId
.
toString
());
...
...
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