luoyang
|
fa831fb819
|
fix notice length 200
|
5 years ago |
luoyang
|
fc180b87d7
|
fix notice length 200
|
5 years ago |
luoyang
|
db974f69e2
|
add 卡支付商户进件、修改、合规文件
|
5 years ago |
yixian
|
1ed31f8b9d
|
Merge branch 'develop'
|
5 years ago |
yixian
|
a5680a8aa4
|
card pay ui
|
5 years ago |
luoyang
|
cb08cd7546
|
add customer_rage_title
|
5 years ago |
dulingling
|
42ec49784d
|
Upd:补充卡支付渠道信息
|
5 years ago |
luoyang
|
33dd59d223
|
add gateway、channel analysis
|
5 years ago |
luoyang
|
2c73c94a24
|
add gateway、channel analysis
|
5 years ago |
yixian
|
d98f927d16
|
send settle email notify details
|
5 years ago |
luoyang
|
e330a51b25
|
add synchronizedScheduler citypartner prize
|
5 years ago |
luoyang
|
c952aab8ce
|
add synchronizedScheduler citypartner prize
|
5 years ago |
dulingling
|
42c3905c66
|
Upd:Card-PDF导出文件
|
5 years ago |
luoyang
|
af058a0eaf
|
fix settlement log detail logo
|
5 years ago |
luoyang
|
56de9cbe66
|
fix settlement log detail logo
|
5 years ago |
luoyang
|
e3fd3bf6c1
|
fix settlement log detail logo
|
5 years ago |
luoyang
|
e9e2c0b82b
|
fix settlement log detail logo
|
5 years ago |
luoyang
|
eb75617143
|
fix run-task false
|
5 years ago |
luoyang
|
4a07254f8e
|
fix run-task false
|
5 years ago |
luoyang
|
531d6ba78a
|
delete run-task
|
5 years ago |
yixian
|
93fecf86f3
|
aba config
|
5 years ago |
yixian
|
6d6c8e52a3
|
aba config
|
5 years ago |
dulingling
|
0f7f855ffa
|
Upd:商户信息增加IT联系人邮箱
|
5 years ago |
dulingling
|
a17a169b50
|
Merge branch 'develop' into develop-card-compliance
|
5 years ago |
dulingling
|
9bc63da27b
|
Upd:商户详情增加IT联系人邮箱
|
5 years ago |
dulingling
|
a79ebc6150
|
Upd:修复商户支付配置-微信子商户id修改后弹框不消失
|
5 years ago |
dulingling
|
4fa6d70ee1
|
Upd:修复商户支付配置-微信子商户id修改后弹框不消失
|
5 years ago |
taylor.dang
|
8fcce78c76
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
taylor.dang
|
812b2474d6
|
[Y] apple 登录
|
5 years ago |
dulingling
|
bfa4552ef5
|
Upd:修改账单码
|
5 years ago |
dulingling
|
63631a6b46
|
Upd:修改账单码
|
5 years ago |
dulingling
|
f4c65d3443
|
Upd:修改账单码
|
5 years ago |
dulingling
|
3a10bef91f
|
Upd:修改账单码
|
5 years ago |
luoyang
|
7d054dd0ca
|
add gatewayMerchant applyid check
|
5 years ago |
luoyang
|
c869da45f3
|
add gatewayMerchant applyid check
|
5 years ago |
luoyang
|
7ed35a4985
|
fix common yml
|
5 years ago |
luoyang
|
e5276b6c1f
|
fix common yml
|
5 years ago |
luoyang
|
17462ff6db
|
fix common yml
|
5 years ago |
luoyang
|
7c18556604
|
fix common yml
|
5 years ago |
luoyang
|
a3bd4347de
|
fix js error
|
5 years ago |
luoyang
|
aec2992c59
|
fix js error
|
5 years ago |
luoyang
|
1c9b4d7466
|
fix common
|
5 years ago |
luoyang
|
5b64fce5d3
|
fix application-common
|
5 years ago |
luoyang
|
9cb6a764ce
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/ui/static/payment/cashiers/templates/cashiers.html
|
5 years ago |
luoyang
|
3c900bc4e5
|
add 增加merchant warrior合规材料
|
5 years ago |
luoyang
|
39ce176318
|
add 增加merchant warrior合规材料
|
5 years ago |
dulingling
|
79425c194f
|
Upd:新版账单码
|
5 years ago |
luoyang
|
3a9ef10f62
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
83043c85dc
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
517dd5e448
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
cd8c113727
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
2ee3b25528
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
f3c628f9c9
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
cc5212d1bf
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
10dba562ee
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
d54ffcccf6
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
397a2862b8
|
add 合规查看清算统计的权限
|
5 years ago |
luoyang
|
cfa4c57396
|
fix rate_value max 5
|
5 years ago |
luoyang
|
f274b18ef9
|
fix rate_value max 5
|
5 years ago |
yixian
|
df5db11435
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
yixian
|
c72dfc2ece
|
configuration
|
5 years ago |
luoyang
|
ba1b1579e7
|
fix notice desc
|
5 years ago |
luoyang
|
23978cf017
|
fix notice desc
|
5 years ago |
yixian
|
e9039688f3
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
yixian
|
10f413399d
|
upgrade 2.1.22
|
5 years ago |
luoyang
|
2755d0ac98
|
fix trade logs gateway
|
5 years ago |
luoyang
|
aa58fb25be
|
fix order gateway support
|
5 years ago |
luoyang
|
9635709302
|
add 商户合规增加合规专员显示
|
5 years ago |
luoyang
|
3894c860c9
|
add 商户合规增加合规专员显示
|
5 years ago |
luoyang
|
a2b3d0c9c4
|
add 商户合规增加合规专员显示
|
5 years ago |
luoyang
|
5d1b5a025d
|
add 商户合规增加合规专员显示
|
5 years ago |
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 |
luoyang
|
bf447acd9b
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
luoyang
|
d871253368
|
add 支持合并清算报表下载查看、退款增加弹窗
|
5 years ago |
luoyang
|
ce9582ea52
|
fix h5 redirect url encode
|
5 years ago |
luoyang
|
351fa05ad7
|
fix h5 redirect url encode
|
5 years ago |
luoyang
|
d5046d97b3
|
add 手动清算增加统计功能
|
5 years ago |
luoyang
|
1a3fa95ddd
|
add 手动清算增加统计功能
|
5 years ago |
taylor.dang
|
4390b7764d
|
Merge branch 'develop'
|
5 years ago |
taylor.dang
|
4997d6ff11
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
taylor.dang
|
697c687c22
|
[Y] h5网关
|
5 years ago |
luoyang
|
c3e81c06e7
|
优化gateway 上传文件报错
|
5 years ago |
luoyang
|
39d3837e9c
|
优化gateway 上传文件报错
|
5 years ago |
luoyang
|
61c6d63508
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
luoyang
|
d2e61ea9df
|
add 商户欠款列表分类
|
5 years ago |
taylor.dang
|
eaf8eab087
|
apidoc
|
5 years ago |
taylor.dang
|
dde64031d4
|
apidoc
|
5 years ago |
luoyang
|
b2c6383146
|
fix 商户类别交易趋势统计 旅游出行
|
5 years ago |
luoyang
|
3f613fd797
|
fix 商户类别交易趋势统计 旅游出行
|
5 years ago |
yixian
|
bfc88976a7
|
build: ui docker
|
5 years ago |
luoyang
|
3af3762cc3
|
fix 优化商户新增增值服务
|
5 years ago |
luoyang
|
dbdbdc91bf
|
fix 优化商户新增增值服务
|
5 years ago |
luoyang
|
bc4f598a36
|
fix 优化商户新增增值服务
|
5 years ago |
luoyang
|
c0944f4bd3
|
fix 优化商户新增增值服务
|
5 years ago |
luoyang
|
081b7fcb67
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
luoyang
|
c65b6a257d
|
fix 优化商户新增增值服务,增加新增付费debit
|
5 years ago |
luoyang
|
1057149b7b
|
fix echarts partner为false加1情况
|
5 years ago |
luoyang
|
698ec55577
|
fix echarts partner为false加1情况
|
5 years ago |
luoyang
|
b20384f400
|
fix search date range
|
5 years ago |
luoyang
|
12a18e643f
|
fix search date range
|
5 years ago |
luoyang
|
5e45653238
|
Merge branch 'develop'
|
5 years ago |