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
2bb50c92
Commit
2bb50c92
authored
Nov 26, 2020
by
张志恒
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
混合支付添加退款日志
parent
651c7c07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
2bb50c92
...
@@ -160,6 +160,8 @@ public enum ResponseResult {
...
@@ -160,6 +160,8 @@ public enum ResponseResult {
ORDER_TAKE_OUT_ADDRESS_NOT_VALID
(
"45063"
,
"收货地址校验失败"
),
ORDER_TAKE_OUT_ADDRESS_NOT_VALID
(
"45063"
,
"收货地址校验失败"
),
ORDER_PICK_UP_GOOD_NO
(
"45064"
,
"更新取餐码失败"
),
ORDER_PICK_UP_GOOD_NO
(
"45064"
,
"更新取餐码失败"
),
ORDER_NOT_CREATE_ERROR
(
"45065"
,
"请不要重复创建订单"
),
ORDER_NOT_CREATE_ERROR
(
"45065"
,
"请不要重复创建订单"
),
MULTIORDER__ERRORREFUND
(
"45005"
,
"订单申请退款失败"
),
/**
/**
* 支付
* 支付
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
2bb50c92
...
@@ -1672,7 +1672,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1672,7 +1672,7 @@ public class OrderServiceImpl implements Orderservice {
MultiOrderRefundRequest
multiOrderRefundRequest
=
orderAdapter
.
getMultiOrderPayRefundRequest
(
orderBean
,
refundId
);
MultiOrderRefundRequest
multiOrderRefundRequest
=
orderAdapter
.
getMultiOrderPayRefundRequest
(
orderBean
,
refundId
);
MultiOrderRefundResponse
multiOrderRefundResponse
=
mulitiPaymentClient
.
paymentApplicationRefund
(
multiOrderRefundRequest
,
orderBean
.
getCompanyId
());
MultiOrderRefundResponse
multiOrderRefundResponse
=
mulitiPaymentClient
.
paymentApplicationRefund
(
multiOrderRefundRequest
,
orderBean
.
getCompanyId
());
if
(
multiOrderRefundResponse
==
null
||
multiOrderRefundResponse
.
getData
()
==
null
||
!
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
domain
.
ResponseCodeConstant
.
ORDER_PAY_RESPONSE_SUCCESS
.
equals
(
multiOrderRefundResponse
.
getCode
()))
{
if
(
multiOrderRefundResponse
==
null
||
multiOrderRefundResponse
.
getData
()
==
null
||
!
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
domain
.
ResponseCodeConstant
.
ORDER_PAY_RESPONSE_SUCCESS
.
equals
(
multiOrderRefundResponse
.
getCode
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"o
rderRefund_failed"
);
return
ResponseUtil
.
error
(
ResponseResult
.
MULTIORDER__ERRORREFUND
.
getCode
(),
"multiO
rderRefund_failed"
);
}
}
List
<
MultiOrderRefundResponse
.
RefundPlatformResponse
>
refundPlatformResponseList
=
multiOrderRefundResponse
.
getData
().
refundPlatformResponseList
;
List
<
MultiOrderRefundResponse
.
RefundPlatformResponse
>
refundPlatformResponseList
=
multiOrderRefundResponse
.
getData
().
refundPlatformResponseList
;
refundPlatformResponseList
=
refundPlatformResponseList
.
stream
().
filter
(
m
->
!
m
.
getEbcode
().
equalsIgnoreCase
(
"10102"
)).
collect
(
Collectors
.
toList
());
refundPlatformResponseList
=
refundPlatformResponseList
.
stream
().
filter
(
m
->
!
m
.
getEbcode
().
equalsIgnoreCase
(
"10102"
)).
collect
(
Collectors
.
toList
());
...
...
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