Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
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
fitness-server
fit-finance
Commits
e36cb7bc
Commit
e36cb7bc
authored
Apr 12, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:get fee rate
parent
3da35aea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
+0
-5
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
+2
-1
No files found.
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
View file @
e36cb7bc
...
...
@@ -75,8 +75,6 @@ public class PayConvert {
MerchantVO
merchant
)
{
setSubChannel
(
params
);
Long
id
=
IdWorker
.
getId
();
BigDecimal
feeRate
=
getFeeRate
(
params
,
merchant
);
BigDecimal
fee
=
FeeUtil
.
calPayFee
(
feeRate
,
params
.
getTransAmount
());
return
StudioCashierRecord
.
builder
()
.
id
(
id
)
.
transNo
(
id
.
toString
())
...
...
@@ -92,9 +90,6 @@ public class PayConvert {
.
channelNo
(
merchant
.
getChannelNo
())
.
subChannel
(
params
.
getSubChannel
().
getCode
())
.
transAmount
(
params
.
getTransAmount
())
.
feeRate
(
feeRate
)
.
fee
(
fee
)
.
actualAmount
(
MoneyUtil
.
subtract
(
params
.
getTransAmount
(),
fee
))
.
transState
(
BrandCashierTransStateEnum
.
PAY_INIT
.
getCode
())
.
buyerName
(
params
.
getBuyerName
())
.
buyerPhone
(
params
.
getBuyerPhone
())
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
View file @
e36cb7bc
...
...
@@ -41,6 +41,7 @@ import com.jiejing.fitness.finance.service.rpc.PayRpcService;
import
com.jiejing.fitness.finance.service.rpc.StudioRpcService
;
import
com.jiejing.fitness.finance.service.utils.DingUtil
;
import
com.jiejing.fitness.finance.service.utils.FeeUtil
;
import
com.jiejing.fitness.finance.service.utils.MoneyUtil
;
import
com.jiejing.paycenter.api.pay.PayApi
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
com.jiejing.paycenter.common.enums.common.TransStateEnums
;
...
...
@@ -170,7 +171,7 @@ public class PayServiceImpl implements PayService {
PayRequest
request
=
PayConvert
.
convert
(
params
,
record
);
record
.
setFeeRate
(
payRpcService
.
getFeeRate
(
request
));
record
.
setFee
(
FeeUtil
.
calPayFee
(
record
.
getFeeRate
(),
params
.
getTransAmount
()));
record
.
setActualAmount
(
MoneyUtil
.
subtract
(
params
.
getTransAmount
(),
record
.
getFee
()));
studioCashierRecordRpService
.
insert
(
record
);
return
payRpcService
.
pay
(
request
);
}
...
...
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