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
2ae9a2ae
Commit
2ae9a2ae
authored
Aug 08, 2023
by
rui.zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对应售后明细字段
parent
0b28c00f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundResponse.java
+1
-2
order-management/src/main/java/cn/freemud/management/service/handle/MultiRefundService.java
+3
-4
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
+1
-1
No files found.
order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundResponse.java
View file @
2ae9a2ae
package
cn
.
freemud
.
management
.
entities
.
dto
.
response
.
pay
;
import
cn.freemud.management.enums.ResponseResult
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq
;
import
com.freemud.sdk.api.assortment.order.enums.PayRefundStatus
;
import
lombok.Data
;
...
...
@@ -73,7 +72,7 @@ public class PayRefundResponse {
/**
* 退款时间 单位毫秒
*/
private
Long
refund
Dat
e
;
private
Long
refund
Tim
e
;
/**
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
*/
...
...
order-management/src/main/java/cn/freemud/management/service/handle/MultiRefundService.java
View file @
2ae9a2ae
...
...
@@ -9,7 +9,6 @@ import cn.freemud.management.thirdparty.MulitiPaymentClient;
import
cn.freemud.management.util.RedisUtil
;
import
cn.freemud.redis.RedisCache
;
import
com.freemud.application.sdk.api.ordercenter.enums.PayChannelType
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp
;
import
com.freemud.sdk.api.assortment.order.enums.PayRefundStatus
;
import
com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest
;
...
...
@@ -117,9 +116,9 @@ public class MultiRefundService {
PayRefundResponse
.
PayRefundItem
refundItem
=
new
PayRefundResponse
.
PayRefundItem
();
refundItem
.
setPayChannelType
(
Integer
.
valueOf
(
PayChannelType
.
getByEbcode
(
r
.
getEbcode
()).
getIndex
()));
refundItem
.
setPayChannelName
(
PayChannelType
.
getByEbcode
(
r
.
getEbcode
()).
getName
());
refundItem
.
setAmount
(
r
.
getRefundAmount
());
refundItem
.
setAmount
(
r
.
get
Settle
RefundAmount
());
refundItem
.
setRefundTradeNo
(
r
.
getRefundTradeNo
());
refundItem
.
setRefund
Dat
e
(
DateUtil
.
convert2Date
(
r
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
refundItem
.
setRefund
Tim
e
(
DateUtil
.
convert2Date
(
r
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
//TODO 混合支付储值卡卡号 这里需要跟支付对接,下游设计中
// refundItem.setCardCode("?");
return
refundItem
;
...
...
@@ -156,7 +155,7 @@ public class MultiRefundService {
refundItem
.
setPayChannelName
(
PayChannelType
.
getByEbcode
(
data
.
getEbcode
()).
getName
());
refundItem
.
setAmount
(
data
.
getRefundAmount
());
refundItem
.
setRefundTradeNo
(
data
.
getRefundEndTransTradeNo
());
refundItem
.
setRefund
Dat
e
(
DateUtil
.
convert2Date
(
data
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
refundItem
.
setRefund
Tim
e
(
DateUtil
.
convert2Date
(
data
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
refundItems
.
add
(
refundItem
);
}
}
catch
(
Throwable
e
)
{
...
...
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
View file @
2ae9a2ae
...
...
@@ -206,7 +206,7 @@ public class PaymentHandle {
refundItem
.
setPayChannelName
(
PayChannelType
.
getByEbcode
(
data
.
getPayCode
()).
getName
());
refundItem
.
setAmount
(
data
.
getRefundAmount
().
intValue
());
refundItem
.
setRefundTradeNo
(
data
.
getRefundTradeNo
());
refundItem
.
setRefund
Dat
e
(
DateUtil
.
convert2Date
(
data
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
refundItem
.
setRefund
Tim
e
(
DateUtil
.
convert2Date
(
data
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
refundItemList
.
add
(
refundItem
);
}
PayRefundResponse
payRefundResponse
=
handlePayRefundResponse
(
refundStatus
,
refundReq
.
getRefundId
());
...
...
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