luoyang
|
2d7699dc3a
|
add 黑名单配置
|
5 years ago |
|
luoyang
|
f8c84cd469
|
add 黑名单配置
|
5 years ago |
yixian
|
93996a57f8
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
99f34b8299
|
documents
|
5 years ago |
|
luoyang
|
b1bc829eab
|
fix delete test
|
5 years ago |
|
luoyang
|
7dd0ba436b
|
add get pine account password
|
5 years ago |
|
luoyang
|
3b07268d25
|
fix rpaypmt_card title
|
5 years ago |
|
luoyang
|
560904631e
|
add 商户enable_rpaypmt_card、enable_rpaypmt_dd开关
|
5 years ago |
|
yixian
|
5834044776
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
078ade354b
|
ui update
|
5 years ago |
|
luoyang
|
1db449cd48
|
fix dashboard card payment amount
|
5 years ago |
|
luoyang
|
fa4357a69c
|
add 增加卡支付报备信息展示
|
5 years ago |
|
luoyang
|
04f13e696a
|
add cashiers disable、enable
|
5 years ago |
|
luoyang
|
078d74f85d
|
add cashier disable
|
5 years ago |
|
yixian
|
70b1ca4cea
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
9557a11de8
|
ui update
|
5 years ago |
|
luoyang
|
a96ded6509
|
add cashiers disable、enable
|
5 years ago |
|
yixian
|
78063f28be
|
ui update
|
5 years ago |
|
yixian
|
c441fff246
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# pom.xml
|
5 years ago |
|
yixian
|
4b86bdebe0
|
json issue
|
5 years ago |
|
luoyang
|
531485f5b3
|
add mw报备信息展示
|
5 years ago |
|
luoyang
|
8a4a391853
|
fix dashboard
|
5 years ago |
|
luoyang
|
77852b44ae
|
add card payment support
|
5 years ago |
|
yixian
|
b0e1c5f259
|
json issue
|
5 years ago |
|
yixian
|
68fa5e1e4d
|
payment ui
|
5 years ago |
|
yixian
|
950ae5539a
|
payment ui
|
5 years ago |
|
yixian
|
d1a23ce891
|
payment ui
|
5 years ago |
|
yixian
|
593258b5ab
|
payment ui
|
5 years ago |
|
yixian
|
cb74f32ebd
|
ui update
|
5 years ago |
|
luoyang
|
dcbc3b6432
|
fix partner invoice style
|
5 years ago |
|
luoyang
|
9b7554900f
|
fix partner invoice style
|
5 years ago |
|
luoyang
|
0d11db1358
|
fix partner invoice style
|
5 years ago |
|
luoyang
|
229b5ca3bd
|
fix partner invoice style
|
5 years ago |
|
luoyang
|
45645f4b21
|
add partner invoice
|
5 years ago |
|
luoyang
|
6079f869c1
|
add partner invoice
|
5 years ago |
|
luoyang
|
76ae4b2c67
|
fix 开启跨境商城app推送
|
5 years ago |
|
luoyang
|
80fe7bf08c
|
fix 开启跨境商城app推送
|
5 years ago |
|
yixian
|
a1928e2bc9
|
ui update
|
5 years ago |
AlanFenng
|
cf1699b553
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
AlanFenng
|
259511c92b
|
upgrade 优化卡支付表单
|
5 years ago |
|
luoyang
|
fbfdb5f6ef
|
fix settimeout 频率
|
5 years ago |
|
luoyang
|
33a17233de
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
2867b8e746
|
add 增值服务财务报表
|
5 years ago |
|
AlanFenng
|
60a5178c96
|
upgrade 优化卡支付表单
|
5 years ago |
|
yixian
|
c857f05dbb
|
update cardpay ui
|
5 years ago |
|
yixian
|
2b61487add
|
update cardpay ui
|
5 years ago |
|
yixian
|
432dc23671
|
update cardpay ui
|
5 years ago |
|
yixian
|
7f2ce325da
|
update cardpay ui
|
5 years ago |
|
yixian
|
4f1f292f08
|
update cardpay ui
|
5 years ago |
|
yixian
|
0aa4843387
|
update cardpay ui
|
5 years ago |
|
yixian
|
1dca324d35
|
update cardpay ui
|
5 years ago |
|
yixian
|
0a0064b53e
|
update cardpay ui
|
5 years ago |
|
yixian
|
dc342ced84
|
js update
|
5 years ago |
|
yixian
|
2713b90c13
|
js update
|
5 years ago |
|
luoyang
|
4afe778d28
|
delete properties
|
5 years ago |
|
luoyang
|
545be6818f
|
fix merge
|
5 years ago |
|
luoyang
|
02ae04f3ec
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
# src/main/resources/application.properties
|
5 years ago |
|
yixian
|
dd5f00ec69
|
build: 2.1.2 rpaysvc
|
5 years ago |
|
yixian
|
f426f8c354
|
build: 2.1.1 integration
|
5 years ago |
|
yixian
|
856eecac74
|
Merge branch 'develop-2.0' into develop
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application.properties
|
5 years ago |
|
luoyang
|
62748d309f
|
add rservice app notify
|
5 years ago |
|
luoyang
|
f1b9f8d9be
|
add rservice app notify
|
5 years ago |
|
luoyang
|
59dff3dc39
|
add rservice app notify
|
5 years ago |
|
luoyang
|
dd8bf3cb20
|
add rservice app notify
|
5 years ago |
|
luoyang
|
372a4346bb
|
add rservice app notify
|
5 years ago |
|
luoyang
|
f85aec853c
|
add 更新最新合同模版
|
5 years ago |
|
luoyang
|
ca9f244261
|
add 更新最新合同模版
|
5 years ago |
|
luoyang
|
4030e427e8
|
fix rate display
|
5 years ago |
|
luoyang
|
9f7318c3b5
|
fix rate display
|
5 years ago |
|
luoyang
|
f0ca9373d2
|
fix incremental rate display
|
5 years ago |
|
luoyang
|
3f21fe319c
|
fix incremental rate display
|
5 years ago |
|
luoyang
|
9babac186b
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
aef3a80bba
|
add 推送通知test
|
5 years ago |
|
luoyang
|
b80d3e8f0f
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
83b0297b85
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
9325ce6234
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
c56245eac8
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
7005ca9ee2
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
a8a5fd2a1d
|
fix incremental surcharge rate
|
5 years ago |
|
luoyang
|
884be1342f
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
e32ff20b40
|
add 增值服务交易流水
|
5 years ago |
|
luoyang
|
92caef34c2
|
fix dev.properties
|
5 years ago |
|
luoyang
|
65e5378d1c
|
fix transaction 时间选择
|
5 years ago |
|
luoyang
|
5d0958795f
|
fix transaction 时间选择
|
5 years ago |
dulingling
|
2233d346d2
|
Upd:修复部分商户下载文件无法查看订单备注问题
|
5 years ago |
|
dulingling
|
917eadf0f1
|
Upd:修复部分商户下载文件无法查看订单备注问题
|
5 years ago |
|
dulingling
|
2f6738c3bb
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
dulingling
|
d8655ef3e6
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
dulingling
|
04fa2d00d1
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
dulingling
|
6da96d24d7
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
luoyang
|
1d2b48dc57
|
fix risk remark length
|
5 years ago |
|
luoyang
|
a3c6d37a0a
|
fix risk remark length
|
5 years ago |
|
luoyang
|
866153a943
|
fix merge settle total surcharge
|
5 years ago |
|
luoyang
|
574d45c7f2
|
fix merge settle total surcharge
|
5 years ago |
|
luoyang
|
7851c9f922
|
fix pom.xml
|
5 years ago |
|
luoyang
|
eaaefc6334
|
fix pom.xml
|
5 years ago |
|
luoyang
|
a561db26cf
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
08328d4370
|
add ap清算文件 报表增加商户编码和简称
|
5 years ago |
|
luoyang
|
529be0e353
|
fix 清算日报时间误差
|
5 years ago |
|
luoyang
|
cbb48c0f81
|
fix 清算日报时间误差
|
5 years ago |
