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
b66fe08b
Commit
b66fe08b
authored
Apr 25, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:appUrl
parent
efd789de
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
48 additions
and
9 deletions
+48
-9
app/src/main/resources/application-canary.yml
+4
-2
app/src/main/resources/application-dev.yml
+4
-2
app/src/main/resources/application-local.yml
+4
-2
app/src/main/resources/application-prod.yml
+4
-2
app/src/main/resources/application-rc.yml
+3
-0
service/src/main/java/com/jiejing/fitness/finance/service/config/AppUrlProperties.java
+18
-0
service/src/main/java/com/jiejing/fitness/finance/service/config/FinancePropertiesConfiguration.java
+6
-1
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
+5
-0
No files found.
app/src/main/resources/application-canary.yml
View file @
b66fe08b
...
@@ -20,4 +20,6 @@ finance:
...
@@ -20,4 +20,6 @@ finance:
ali_native
:
"
002"
ali_native
:
"
002"
wx_native
:
"
003"
wx_native
:
"
003"
ali_app
:
"
002"
ali_app
:
"
002"
wx_app
:
"
003"
wx_app
:
"
003"
\ No newline at end of file
appUrl
:
transDetail
:
https://dev.xiaomai5.com/sports-h5/pay.html#/pay/transaction-record/detail?id=
\ No newline at end of file
app/src/main/resources/application-dev.yml
View file @
b66fe08b
...
@@ -20,4 +20,6 @@ finance:
...
@@ -20,4 +20,6 @@ finance:
ali_native
:
"
002"
ali_native
:
"
002"
wx_native
:
"
003"
wx_native
:
"
003"
ali_app
:
"
002"
ali_app
:
"
002"
wx_app
:
"
003"
wx_app
:
"
003"
\ No newline at end of file
appUrl
:
transDetail
:
https://dev.xiaomai5.com/sports-h5/pay.html#/pay/transaction-record/detail?id=
\ No newline at end of file
app/src/main/resources/application-local.yml
View file @
b66fe08b
...
@@ -25,4 +25,6 @@ finance:
...
@@ -25,4 +25,6 @@ finance:
ali_native
:
"
002"
ali_native
:
"
002"
wx_native
:
"
003"
wx_native
:
"
003"
ali_app
:
"
002"
ali_app
:
"
002"
wx_app
:
"
003"
wx_app
:
"
003"
\ No newline at end of file
appUrl
:
transDetail
:
https://dev.xiaomai5.com/sports-h5/pay.html#/pay/transaction-record/detail?id=
\ No newline at end of file
app/src/main/resources/application-prod.yml
View file @
b66fe08b
...
@@ -20,4 +20,6 @@ finance:
...
@@ -20,4 +20,6 @@ finance:
ali_native
:
"
002"
ali_native
:
"
002"
wx_native
:
"
003"
wx_native
:
"
003"
ali_app
:
"
002"
ali_app
:
"
002"
wx_app
:
"
003"
wx_app
:
"
003"
\ No newline at end of file
appUrl
:
transDetail
:
https://dev.xiaomai5.com/sports-h5/pay.html#/pay/transaction-record/detail?id=
\ No newline at end of file
app/src/main/resources/application-rc.yml
View file @
b66fe08b
...
@@ -21,3 +21,5 @@ finance:
...
@@ -21,3 +21,5 @@ finance:
wx_native
:
"
003"
wx_native
:
"
003"
ali_app
:
"
002"
ali_app
:
"
002"
wx_app
:
"
003"
wx_app
:
"
003"
appUrl
:
transDetail
:
https://dev.xiaomai5.com/sports-h5/pay.html#/pay/transaction-record/detail?id=
\ No newline at end of file
service/src/main/java/com/jiejing/fitness/finance/service/config/AppUrlProperties.java
0 → 100644
View file @
b66fe08b
package
com
.
jiejing
.
fitness
.
finance
.
service
.
config
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
/**
* 支付渠道配置
*
* @author chengyubing
* @since 2024/4/15 14:14
*/
@Data
@ConfigurationProperties
(
prefix
=
"finance.appUrl"
)
public
class
AppUrlProperties
{
private
String
transDetail
;
}
service/src/main/java/com/jiejing/fitness/finance/service/config/
PayChannel
Configuration.java
→
service/src/main/java/com/jiejing/fitness/finance/service/config/
FinanceProperties
Configuration.java
View file @
b66fe08b
...
@@ -8,11 +8,16 @@ import org.springframework.context.annotation.Configuration;
...
@@ -8,11 +8,16 @@ import org.springframework.context.annotation.Configuration;
* @since 2024/4/15 15:30
* @since 2024/4/15 15:30
*/
*/
@Configuration
@Configuration
public
class
PayChannel
Configuration
{
public
class
FinanceProperties
Configuration
{
@Bean
@Bean
public
PayChannelProperties
payChannelProperties
()
{
public
PayChannelProperties
payChannelProperties
()
{
return
new
PayChannelProperties
();
return
new
PayChannelProperties
();
}
}
@Bean
public
AppUrlProperties
appUrlProperties
()
{
return
new
AppUrlProperties
();
}
}
}
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
View file @
b66fe08b
...
@@ -29,6 +29,7 @@ import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
...
@@ -29,6 +29,7 @@ import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
import
com.jiejing.fitness.finance.repository.service.StudioCheckSettleRecordRpService
;
import
com.jiejing.fitness.finance.repository.service.StudioCheckSettleRecordRpService
;
import
com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService
;
import
com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService
;
import
com.jiejing.fitness.finance.repository.service.StudioSettleRecordRpService
;
import
com.jiejing.fitness.finance.repository.service.StudioSettleRecordRpService
;
import
com.jiejing.fitness.finance.service.config.AppUrlProperties
;
import
com.jiejing.fitness.finance.service.config.PayChannelProperties
;
import
com.jiejing.fitness.finance.service.config.PayChannelProperties
;
import
com.jiejing.fitness.finance.service.enums.FinanceErrorEnums
;
import
com.jiejing.fitness.finance.service.enums.FinanceErrorEnums
;
import
com.jiejing.fitness.finance.service.enums.GlobalConfigEnums
;
import
com.jiejing.fitness.finance.service.enums.GlobalConfigEnums
;
...
@@ -100,6 +101,9 @@ public class PayServiceImpl implements PayService {
...
@@ -100,6 +101,9 @@ public class PayServiceImpl implements PayService {
private
PayChannelProperties
config
;
private
PayChannelProperties
config
;
@Resource
@Resource
private
AppUrlProperties
appUrlProperties
;
@Resource
private
PartyToMerchantRpService
partyToMerchantRpService
;
private
PartyToMerchantRpService
partyToMerchantRpService
;
@Resource
@Resource
...
@@ -510,6 +514,7 @@ public class PayServiceImpl implements PayService {
...
@@ -510,6 +514,7 @@ public class PayServiceImpl implements PayService {
paramMap
.
put
(
"studioId"
,
studioId
);
paramMap
.
put
(
"studioId"
,
studioId
);
paramMap
.
put
(
"buyerName"
,
buyerName
);
paramMap
.
put
(
"buyerName"
,
buyerName
);
paramMap
.
put
(
"amount"
,
e
.
getAmount
());
paramMap
.
put
(
"amount"
,
e
.
getAmount
());
paramMap
.
put
(
"appUrl"
,
appUrlProperties
.
getTransDetail
()
+
e
.
getTransNo
());
return
paramMap
;
return
paramMap
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
...
...
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