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
d0a8b244
Commit
d0a8b244
authored
Feb 01, 2023
by
咸鱼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复NumberFormatException,混合支付退款金额去settlementAmount
parent
b3b0fa53
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
order-management/src/main/java/cn/freemud/management/adapter/PaymentSdkAdapter.java
+1
-1
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/adapter/PaymentSdkAdapter.java
View file @
d0a8b244
...
@@ -76,7 +76,7 @@ public class PaymentSdkAdapter {
...
@@ -76,7 +76,7 @@ public class PaymentSdkAdapter {
multiQueryRequest
.
setPartnerId
(
partnerId
);
multiQueryRequest
.
setPartnerId
(
partnerId
);
multiQueryRequest
.
setStoreId
(
storeCode
);
multiQueryRequest
.
setStoreId
(
storeCode
);
multiQueryRequest
.
setFmId
(
""
);
multiQueryRequest
.
setFmId
(
""
);
multiQueryRequest
.
setRefundAmount
(
Long
.
valueOf
(
String
.
valueOf
(
refundAmount
)
));
multiQueryRequest
.
setRefundAmount
(
refundAmount
.
longValue
(
));
multiQueryRequest
.
setRefundTradeNo
(
String
.
valueOf
(
getRefundSerialNo
()));
multiQueryRequest
.
setRefundTradeNo
(
String
.
valueOf
(
getRefundSerialNo
()));
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setVer
(
"V1"
);
multiQueryRequest
.
setVer
(
"V1"
);
...
...
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
View file @
d0a8b244
...
@@ -140,7 +140,7 @@ public class PaymentHandle {
...
@@ -140,7 +140,7 @@ public class PaymentHandle {
public
PayRefundResponse
getCommonPayRefundResponse
(
OrderInfoReqs
order
,
String
reason
)
{
public
PayRefundResponse
getCommonPayRefundResponse
(
OrderInfoReqs
order
,
String
reason
)
{
PayRefundResponse
refundResponse
;
PayRefundResponse
refundResponse
;
try
{
try
{
BigDecimal
refundAmount
=
getRefundAmount
(
order
.
getPartnerId
(),
order
.
get
ActualPay
Amount
(),
order
.
getOrderCode
());
BigDecimal
refundAmount
=
getRefundAmount
(
order
.
getPartnerId
(),
order
.
get
Settlement
Amount
(),
order
.
getOrderCode
());
if
(
CollectionUtils
.
isNotEmpty
(
order
.
getOrderPayItemCreateReqList
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
order
.
getOrderPayItemCreateReqList
()))
{
// payment/application/refund
// payment/application/refund
refundResponse
=
this
.
multiRefund
(
order
.
getPartnerId
(),
order
.
getStoreId
(),
order
.
getOrderCode
(),
refundAmount
);
refundResponse
=
this
.
multiRefund
(
order
.
getPartnerId
(),
order
.
getStoreId
(),
order
.
getOrderCode
(),
refundAmount
);
...
...
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