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
3da35aea
Commit
3da35aea
authored
Apr 12, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:get fee rate
parent
c1314cd8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
+6
-3
service/src/main/java/com/jiejing/fitness/finance/service/rpc/PayRpcService.java
+6
-0
No files found.
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
View file @
3da35aea
...
@@ -40,6 +40,8 @@ import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
...
@@ -40,6 +40,8 @@ import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
import
com.jiejing.fitness.finance.service.rpc.PayRpcService
;
import
com.jiejing.fitness.finance.service.rpc.PayRpcService
;
import
com.jiejing.fitness.finance.service.rpc.StudioRpcService
;
import
com.jiejing.fitness.finance.service.rpc.StudioRpcService
;
import
com.jiejing.fitness.finance.service.utils.DingUtil
;
import
com.jiejing.fitness.finance.service.utils.DingUtil
;
import
com.jiejing.fitness.finance.service.utils.FeeUtil
;
import
com.jiejing.paycenter.api.pay.PayApi
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
com.jiejing.paycenter.common.enums.common.TransStateEnums
;
import
com.jiejing.paycenter.common.enums.common.TransStateEnums
;
import
com.jiejing.paycenter.common.enums.pay.PayTypeEnums
;
import
com.jiejing.paycenter.common.enums.pay.PayTypeEnums
;
...
@@ -164,11 +166,12 @@ public class PayServiceImpl implements PayService {
...
@@ -164,11 +166,12 @@ public class PayServiceImpl implements PayService {
}
}
MerchantVO
merchant
=
merchantRpcService
.
getByMerchantId
(
relation
.
getMerchantId
());
MerchantVO
merchant
=
merchantRpcService
.
getByMerchantId
(
relation
.
getMerchantId
());
StudioCashierRecord
record
=
PayConvert
.
convertPayInit
(
params
,
studio
,
merchant
);
StudioCashierRecord
record
=
PayConvert
.
convertPayInit
(
params
,
studio
,
merchant
);
studioCashierRecordRpService
.
insert
(
record
);
PayRequest
request
=
PayConvert
.
convert
(
params
,
record
);
PayRequest
request
=
PayConvert
.
convert
(
params
,
record
);
record
.
setFeeRate
(
payRpcService
.
getFeeRate
(
request
));
record
.
setFee
(
FeeUtil
.
calPayFee
(
record
.
getFeeRate
(),
params
.
getTransAmount
()));
studioCashierRecordRpService
.
insert
(
record
);
return
payRpcService
.
pay
(
request
);
return
payRpcService
.
pay
(
request
);
}
}
...
...
service/src/main/java/com/jiejing/fitness/finance/service/rpc/PayRpcService.java
View file @
3da35aea
...
@@ -55,4 +55,10 @@ public class PayRpcService {
...
@@ -55,4 +55,10 @@ public class PayRpcService {
return
Optional
.
ofNullable
(
result
.
getResult
())
return
Optional
.
ofNullable
(
result
.
getResult
())
.
orElse
(
SettleVO
.
builder
().
transAmount
(
BigDecimal
.
ZERO
).
build
());
.
orElse
(
SettleVO
.
builder
().
transAmount
(
BigDecimal
.
ZERO
).
build
());
}
}
public
BigDecimal
getFeeRate
(
PayRequest
request
)
{
JsonResult
<
BigDecimal
>
result
=
payApi
.
getFeeRate
(
request
);
return
result
.
getResult
();
}
}
}
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