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
8bbb6f78
Commit
8bbb6f78
authored
Aug 17, 2023
by
rui.zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor:修改退款明细中的支付渠道和名称的获取逻辑
parent
24f2cebc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
6 deletions
+30
-6
order-management/src/main/java/cn/freemud/management/adapter/OrderCancelReqAdapter.java
+6
-6
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayMethodEnum.java
+24
-0
No files found.
order-management/src/main/java/cn/freemud/management/adapter/OrderCancelReqAdapter.java
View file @
8bbb6f78
...
@@ -47,8 +47,8 @@ public class OrderCancelReqAdapter {
...
@@ -47,8 +47,8 @@ public class OrderCancelReqAdapter {
refundItem
.
setPayChannelType
(
Integer
.
valueOf
(
orderRefundData
.
getCashType
()));
refundItem
.
setPayChannelType
(
Integer
.
valueOf
(
orderRefundData
.
getCashType
()));
refundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
orderRefundData
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
orderRefundData
.
getCashType
()).
getDesc
());
refundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
orderRefundData
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
orderRefundData
.
getCashType
()).
getDesc
());
}
else
{
}
else
{
refundItem
.
setPayChannelType
(
PayMethodEnum
.
get
ByCode
(
orderRefundData
.
getPayMethodCode
()).
getIndex
(
));
refundItem
.
setPayChannelType
(
PayMethodEnum
.
get
IndexByCode
(
orderRefundData
.
getPayMethodCode
()
));
refundItem
.
setPayChannelName
(
PayMethodEnum
.
get
ByCode
(
orderRefundData
.
getPayMethodCode
()).
getDesc
(
));
refundItem
.
setPayChannelName
(
PayMethodEnum
.
get
DescByCode
(
orderRefundData
.
getPayMethodCode
()
));
}
}
refundItem
.
setAmount
(
orderRefundData
.
getRefundAmount
().
intValue
());
refundItem
.
setAmount
(
orderRefundData
.
getRefundAmount
().
intValue
());
refundItem
.
setRefundTradeNo
(
orderRefundData
.
getRefundTradeNo
());
refundItem
.
setRefundTradeNo
(
orderRefundData
.
getRefundTradeNo
());
...
@@ -66,8 +66,8 @@ public class OrderCancelReqAdapter {
...
@@ -66,8 +66,8 @@ public class OrderCancelReqAdapter {
refundItem
.
setPayChannelType
(
Integer
.
valueOf
(
r
.
getCashType
()));
refundItem
.
setPayChannelType
(
Integer
.
valueOf
(
r
.
getCashType
()));
refundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
r
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
r
.
getCashType
()).
getDesc
());
refundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
r
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
r
.
getCashType
()).
getDesc
());
}
else
{
}
else
{
refundItem
.
setPayChannelType
(
PayMethodEnum
.
get
ByCode
(
r
.
getPayMethodCode
()).
getIndex
(
));
refundItem
.
setPayChannelType
(
PayMethodEnum
.
get
IndexByCode
(
r
.
getPayMethodCode
()
));
refundItem
.
setPayChannelName
(
PayMethodEnum
.
get
ByCode
(
r
.
getPayMethodCode
()).
getDesc
(
));
refundItem
.
setPayChannelName
(
PayMethodEnum
.
get
DescByCode
(
r
.
getPayMethodCode
()
));
}
}
refundItem
.
setAmount
(
r
.
getSettleRefundAmount
());
refundItem
.
setAmount
(
r
.
getSettleRefundAmount
());
refundItem
.
setRefundTradeNo
(
r
.
getRefundTradeNo
());
refundItem
.
setRefundTradeNo
(
r
.
getRefundTradeNo
());
...
@@ -86,8 +86,8 @@ public class OrderCancelReqAdapter {
...
@@ -86,8 +86,8 @@ public class OrderCancelReqAdapter {
payRefundItem
.
setPayChannelType
(
Integer
.
valueOf
(
request
.
getCashType
()));
payRefundItem
.
setPayChannelType
(
Integer
.
valueOf
(
request
.
getCashType
()));
payRefundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
request
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
request
.
getCashType
()).
getDesc
());
payRefundItem
.
setPayChannelName
(
CashTypeEnum
.
getByCode
(
request
.
getCashType
())
==
null
?
null
:
CashTypeEnum
.
getByCode
(
request
.
getCashType
()).
getDesc
());
}
else
{
}
else
{
payRefundItem
.
setPayChannelType
(
PayMethodEnum
.
get
ByCode
(
request
.
getPayMethodCode
()).
getIndex
(
));
payRefundItem
.
setPayChannelType
(
PayMethodEnum
.
get
IndexByCode
(
request
.
getPayMethodCode
()
));
payRefundItem
.
setPayChannelName
(
PayMethodEnum
.
get
ByCode
(
request
.
getPayMethodCode
()).
getDesc
(
));
payRefundItem
.
setPayChannelName
(
PayMethodEnum
.
get
DescByCode
(
request
.
getPayMethodCode
()
));
}
}
payRefundItem
.
setAmount
(
request
.
getRefundAmount
());
payRefundItem
.
setAmount
(
request
.
getRefundAmount
());
payRefundItem
.
setRefundTime
(
DateUtil
.
convert2Date
(
request
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
payRefundItem
.
setRefundTime
(
DateUtil
.
convert2Date
(
request
.
getRefundTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
());
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayMethodEnum.java
View file @
8bbb6f78
...
@@ -33,6 +33,30 @@ public enum PayMethodEnum {
...
@@ -33,6 +33,30 @@ public enum PayMethodEnum {
return
null
;
return
null
;
}
}
public
static
Integer
getIndexByCode
(
String
code
)
{
if
(
code
==
null
)
{
return
null
;
}
for
(
PayMethodEnum
payStatus
:
values
())
{
if
(
payStatus
.
getCode
().
equals
(
code
))
{
return
payStatus
.
getIndex
();
}
}
return
null
;
}
public
static
String
getDescByCode
(
String
code
)
{
if
(
code
==
null
)
{
return
null
;
}
for
(
PayMethodEnum
payStatus
:
values
())
{
if
(
payStatus
.
getCode
().
equals
(
code
))
{
return
payStatus
.
getDesc
();
}
}
return
null
;
}
public
String
getCode
()
{
public
String
getCode
()
{
return
code
;
return
code
;
}
}
...
...
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