dalong306
|
2e792468a9
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
dalong306
|
18ace1d49f
|
费率自动延期 日期比较时加等号
|
4 years ago |
yixian
|
224da94372
|
document update
|
4 years ago |
|
yixian
|
9a091c5e06
|
document update
|
4 years ago |
|
yixian
|
024c59c54c
|
fix: default orgid=1 when manager org is null
|
4 years ago |
|
yixian
|
054dc420c3
|
升级核心包，更新配置
|
4 years ago |
dulingling
|
810d601455
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royal-manage into develop
|
4 years ago |
|
yixian
|
0784724b2f
|
UPD: T1738, T1690
|
4 years ago |
|
dulingling
|
594c00ae42
|
api文档-小程序下单支付：customer_id为必填
|
4 years ago |
AlanFenng
|
a4e88a6b77
|
修改环境变量配置文件
|
4 years ago |
|
dalong306
|
37add536e2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royal-manage into develop
|
4 years ago |
|
dalong306
|
5f97b57377
|
INVOICE 大写
|
4 years ago |
|
yixian
|
623d45fd79
|
UPD: rate limit up to 10%
|
4 years ago |
|
yixian
|
f1a2e77676
|
bug fix: sync functions clear all records
|
4 years ago |
|
yixian
|
4931efd039
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
# src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
# src/main/resources/templates/app/invoice.html
|
4 years ago |
|
dalong306
|
285d96b517
|
settle,invoice pdf 推送SecurePay
|
4 years ago |
coral chen
|
93e1f8bc94
|
解除提供商服开店信息的限制
|
4 years ago |
|
coral chen
|
3641107625
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royal-manage into develop
|
4 years ago |
|
coral chen
|
da729610d6
|
解除提供商服开店信息的限制
|
4 years ago |
xiao.tang
|
231540d310
|
✨feat(royalpay):
修复industry——alipay category样式问题
|
4 years ago |
|
yixian
|
54205df2f2
|
remove apple site association
|
4 years ago |
|
yixian
|
f05b405a75
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
c7ae9d0c41
|
postpone
|
4 years ago |
taylor.dang
|
90c66360bd
|
apple-app-site-association
|
4 years ago |
|
dulingling
|
b57e809c30
|
upd:卡优惠汇率合同获取费率修改
|
4 years ago |
|
dulingling
|
604baa63e0
|
upd:卡优惠汇率合同获取费率修改
|
4 years ago |
|
dulingling
|
1b26d28d4a
|
upd:跨境支付合同更新
|
4 years ago |
|
dulingling
|
a1431c72cd
|
upd:更新合同模版
|
4 years ago |
|
dulingling
|
d9bad56e52
|
upd:跨境支付合同更新
|
4 years ago |
|
dulingling
|
a173cebbc9
|
upd:更新合同模版
|
4 years ago |
|
dulingling
|
991388c607
|
upd:商户区分卡费率添加，不失效之前添加记录的费率有效时间
|
4 years ago |
|
dulingling
|
718e2f9547
|
upd:商户区分卡费率添加，不失效之前添加记录的费率有效时间
|
4 years ago |
|
dulingling
|
b74792a7e7
|
upd:费率优惠合同开放下载
|
4 years ago |
|
dulingling
|
c3311dc167
|
upd:费率优惠合同开放下载
|
4 years ago |
|
dulingling
|
7e6105d424
|
升级版本
(cherry picked from commit 4b98c28b65)
|
4 years ago |
|
dulingling
|
4b98c28b65
|
升级版本
|
4 years ago |
|
dulingling
|
7499068cd0
|
upd:修改卡合同文件
|
4 years ago |
|
dulingling
|
8f00fed41f
|
upd:修改卡合同文件
|
4 years ago |
|
taylor.dang
|
cac75a29bd
|
invoice
|
4 years ago |
|
taylor.dang
|
d29fcdaf83
|
invoice
|
4 years ago |
|
taylor.dang
|
408650c599
|
invoice
|
4 years ago |
|
taylor.dang
|
36f3026922
|
txt
|
4 years ago |
|
yixian
|
a60e34faf4
|
ui optmise
|
4 years ago |
|
yixian
|
f83495ab86
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
ed7b8b75a2
|
valid calendar warning level
|
4 years ago |
|
dulingling
|
dd1d590568
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
4 years ago |
|
dulingling
|
1193616476
|
upd:代理商提成生成数据异常修改
|
4 years ago |
|
dulingling
|
d22c2c4823
|
upd:代理商提成生成数据异常修改
|
4 years ago |
|
taylor.dang
|
42d4933668
|
securepay file
|
4 years ago |
|
yixian
|
1c75a5cd9a
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
4 years ago |
|
yixian
|
8bf4d5743d
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
5bed230f08
|
settle mail sending error logs
|
4 years ago |
|
dulingling
|
cba4aa6e03
|
upd:代理商提成sql调整，数据为负数，sql转后变为正数，导致数据计算出错
|
4 years ago |
|
dulingling
|
fded1b982d
|
upd:代理商提成sql调整，数据为负数，sql转后变为正数，导致数据计算出错
|
4 years ago |
|
dulingling
|
4a5d8e7c88
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
4 years ago |
|
yixian
|
3fc7f6bec4
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
aa95a18890
|
risk mail template update
|
4 years ago |
|
dulingling
|
199b165344
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
4 years ago |
|
yixian
|
b75a9f9068
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
9170850f74
|
order detail display threeds flag
|
4 years ago |
|
yixian
|
24cd714e0f
|
chargeback 邮件模板修改
|
4 years ago |
|
yixian
|
4c1c13c3f5
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
b4a8d3e9e1
|
risk upload mail template
|
4 years ago |
|
yixian
|
05f57b9a56
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
5b0813612f
|
prevent duplicate chargeback on same order
|
4 years ago |
|
yixian
|
1fd860a55b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
b6cecf086a
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
efabb145b0
|
risk event form optmise
|
4 years ago |
|
dulingling
|
e6071b21c0
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
14a05b90f6
|
代理商生成数据异常修改
|
4 years ago |
|
yixian
|
98b117c87a
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
368ff3a4e8
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1145851e53
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
f4f9570e7b
|
risk mail debug
|
4 years ago |
|
dulingling
|
bb840f3117
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
5c66a634ef
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
a8db303379
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
98a397fa3b
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
553a6409ea
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
0fb3977a20
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
e9ed2cfe28
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
e9dc12b493
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
e9db5f8737
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
b63c5088d6
|
代理商生成数据异常修改
|
4 years ago |
|
taylor.dang
|
ef372eb425
|
fix
|
4 years ago |
|
dulingling
|
5107e23dc3
|
代理商生成数据异常修改
|
4 years ago |
|
dulingling
|
a35bea1d8a
|
代理商生成数据异常修改
|
4 years ago |
|
yixian
|
c3a786e2f3
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
489cafc4c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
ef13b42423
|
UI bug fix
|
4 years ago |
|
dulingling
|
700599435d
|
upd:消息通知，增加通知商户类型增加：卡支付/跨境支付商户
|
4 years ago |
|
yixian
|
67c18bddfb
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
2838b74fe1
|
UI bug fix
|
4 years ago |
|
yixian
|
ddd4a4a181
|
sync code
|
4 years ago |
|
yixian
|
a7b70cf374
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
6a91b978e4
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
639b861495
|
optimise code
|
4 years ago |
|
taylor.dang
|
489368afed
|
[Y] securepay
|
4 years ago |
|
yixian
|
78aa62f892
|
risk control: chargeback
|
4 years ago |
|
yixian
|
f837766573
|
risk control: chargeback
|
4 years ago |
|
taylor.dang
|
63355f405e
|
Merge branch 'develop'
|
4 years ago |
|
taylor.dang
|
aa2e3acbb4
|
[Y] sec
|
4 years ago |
|
taylor.dang
|
e30945a794
|
[Y] securepay
|
4 years ago |
|
yixian
|
498e6db970
|
hotfix 3-ds
|
4 years ago |
|
yixian
|
790b98dfc6
|
hotfix 3-ds
|
4 years ago |
|
yixian
|
7a4ef214c8
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
466cf2f4b3
|
live check optmise
|
4 years ago |
|
yixian
|
607adc4f33
|
fixed ui bug
|
4 years ago |
|
yixian
|
c974184995
|
fixed ui bug
|
4 years ago |
|
yixian
|
28e436a978
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
ae3359dcc4
|
fixed ui bug
|
4 years ago |
|
yixian
|
970136d27a
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
571c149768
|
org default client profile setters
|
4 years ago |
|
yixian
|
ee1a11cbe6
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
fb8908a026
|
org default client profile setters
|
4 years ago |
|
dulingling
|
013713bc5d
|
upd:修复商户自动续费有效期时间问题
|
4 years ago |
|
yixian
|
483367cf45
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
a05d93d48d
|
yesterday trans analysis
|
4 years ago |
|
yixian
|
a18d743ece
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
97d66f1554
|
hotfix-modify min settle
|
4 years ago |
|
taylor.dang
|
df3d19a0dd
|
Merge branch 'develop'
|
4 years ago |
|
taylor.dang
|
39ee9a1505
|
[Y] 修复审核商户报错:无账户导致异常
|
4 years ago |
|
taylor.dang
|
bbb73d11bc
|
fix
|
4 years ago |
|
taylor.dang
|
cd857ee59c
|
fix
|
4 years ago |
|
yixian
|
e67213fce2
|
fix ui
|
4 years ago |
|
yixian
|
466accf5cc
|
fix ui
|
4 years ago |
|
yixian
|
3ef152b35b
|
fix ui
|
4 years ago |
|
yixian
|
436289f86a
|
fix warnings
|
4 years ago |
|
yixian
|
9d16507210
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
4 years ago |
|
yixian
|
17083b8004
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
271df89cac
|
起结金额
|
4 years ago |
|
dulingling
|
8ff744f213
|
upd:平台收支统计年份修复
|
4 years ago |
|
dulingling
|
ab55a070b9
|
upd:平台收支统计年份修复
|
4 years ago |
|
dulingling
|
a52ce2ff7e
|
upd:交易流水汇总信息，统计交易流水数量字段变更
|
4 years ago |
|
yixian
|
99126a7e73
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
3465581d75
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
846414fca7
|
自动延期调整
|
4 years ago |
|
dulingling
|
6f9d525db4
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
6c4280deb5
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
7184bec9d3
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
dulingling
|
3a6a72a418
|
upd:卡申请-合同生成：解析境外/境内费率格式
|
4 years ago |
|
yixian
|
b067ee39a9
|
split companies in bttps file
|
4 years ago |
|
yixian
|
1767cb98e9
|
addressInfo in bttps file 增加容错
|
4 years ago |
dell
|
a46e955fbe
|
修改登录后拿不到权限
|
4 years ago |
|
yixian
|
eaa934d3f9
|
rate config
|
4 years ago |
|
yixian
|
965bf77d63
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
371a17632a
|
rate config
|
4 years ago |
|
dulingling
|
9637a9366d
|
upd:商户数据分析cardpaymenr数据异常修复
|
4 years ago |
|
dulingling
|
11352a4525
|
Upd:修复商户数据分析-交易分布cardpayment数据显示异常问题
|
4 years ago |
|
yixian
|
c6c4c0eedf
|
clean days
|
4 years ago |
|
yixian
|
8a7ff2322a
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
38ee861d03
|
holiday config
|
4 years ago |
|
dell
|
3062338db3
|
registered office address
|
4 years ago |
|
yixian
|
5899bcb4d2
|
ui update
|
4 years ago |
|
yixian
|
dca34577c2
|
log ato output
|
4 years ago |
|
yixian
|
2161d3ca1d
|
reset ato output
|
4 years ago |
|
yixian
|
e713c2128a
|
new rate config bug for card payment
|
4 years ago |
|
yixian
|
d9e5a2f3cd
|
Merge branch 'master' into develop
|
4 years ago |
|
yixian
|
56210da57d
|
holiday config
|
4 years ago |
|
yixian
|
c9affaa158
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
2f87d50253
|
2.2.5 upgrade
|
4 years ago |
|
yixian
|
30051b7dbf
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
9f46f7d02b
|
2.2.5 upgrade
|
4 years ago |
|
yixian
|
89b58523b1
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
55bbff14e3
|
ato report
|
4 years ago |
|
yixian
|
61ca60abd6
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
0bb3a1c687
|
syn progress
|
4 years ago |
|
yixian
|
020fcf4e88
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
680cf5b070
|
ato report
|
4 years ago |
|
yixian
|
6b10596c8b
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
cac15eaf17
|
ui update
|
4 years ago |
|
yixian
|
d15a505dba
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
4 years ago |
|
yixian
|
eee0da230b
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
cd858be89a
|
ato report task
|
4 years ago |
|
dulingling
|
afb05d299d
|
upd:商户地址信息添加标注
|
4 years ago |
|
yixian
|
53797f8654
|
settle tasks api
|
4 years ago |
|
yixian
|
5476012b9a
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
89bbdc5c6e
|
fix ui bug
|
4 years ago |
|
yixian
|
e0a549809f
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
5a2533c289
|
synchronize priority weekends
|
4 years ago |
|
yixian
|
5efa44b141
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
85b3b993bd
|
synchronize priority weekends
|
4 years ago |
|
yixian
|
1655c779f9
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
86eb49834e
|
ui improve for settle_tasks
|
4 years ago |
|
yixian
|
b33e8d5f12
|
ui improve for settle_tasks
|
4 years ago |
|
yixian
|
4e01a8f2a3
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
acf013e712
|
fix ui bugs
|
4 years ago |
|
yixian
|
dab9d8c30c
|
fix ui bugs
|
4 years ago |
|
yixian
|
8bd0a5ae58
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
19aaed8cf7
|
fix ui bugs
|
4 years ago |
|
yixian
|
587fca45ca
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
8b05c0328f
|
fix ui bugs
|
4 years ago |
|
yixian
|
a57e66ca3f
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
0113d7d021
|
fix ui bugs
|
4 years ago |
|
yixian
|
8c2e73d9ea
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
aec5e880e4
|
fix ui bugs
|
4 years ago |
|
yixian
|
b51ce67fb9
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
400722149b
|
fix ui bugs
|
4 years ago |
|
yixian
|
3c031741fb
|
fix ui bugs
|
4 years ago |
|
yixian
|
a169d962d1
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1079f9df9d
|
fix ui bugs
|
4 years ago |
|
yixian
|
473dd17283
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1d62c2cad3
|
ui update
|
4 years ago |
|
yixian
|
83dc0c61bd
|
ui update
|
4 years ago |
|
yixian
|
ad002c1365
|
homepage link
|
4 years ago |
|
yixian
|
d689788a26
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
8e25f25888
|
startup error
|
4 years ago |
|
yixian
|
da78f549ef
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
257f3c2572
|
manual settle
|
4 years ago |
|
yixian
|
63c59702a7
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
dd2f763e24
|
manual settle
|
4 years ago |
|
yixian
|
052e2d2a1f
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
158138c2a0
|
settle task query
|
4 years ago |
|
yixian
|
7da9d3a0ea
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
606ee82d3c
|
ui fix
|
4 years ago |
|
yixian
|
781d8316e2
|
ext rate config
|
4 years ago |
|
yixian
|
88516a1224
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
5abe79cd48
|
clean service
|
4 years ago |
|
yixian
|
8c02412012
|
Merge branch 'develop'
|
4 years ago |
|
yixian
|
1356a61044
|
fix initialize
|
4 years ago |
|
yixian
|
9409ab65a3
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
yixian
|
40b4d7b18e
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
4 years ago |
|
yixian
|
4b89d6c389
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
0ebc79f80b
|
clean detail view
|
4 years ago |
|
dulingling
|
b0768ae7f1
|
upd:代理商配置配置min_rpaypmt_dd_rate非必填
|
4 years ago |
|
dulingling
|
cdd4b0b777
|
upd:代理商配置配置min_rpaypmt_dd_rate非必填
|
4 years ago |
|
dulingling
|
89d0be0c20
|
upd:添加文件
|
4 years ago |
|
dulingling
|
6eea0f8f78
|
upd:代理商cbbank配置修改
|
4 years ago |
|
dulingling
|
6dc73ea9c0
|
upd:代理商cbbank配置修改
|
4 years ago |
|
yixian
|
4eb160239d
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
041dbd1364
|
holiday config
|
4 years ago |
|
dulingling
|
97dfb23718
|
upd:恢复错误注释
|
4 years ago |
|
dulingling
|
9d58ae4838
|
upd:代理商卡支付拆分，商户信息去除杂牌渠道，cbbank非必填
|
4 years ago |
|
dulingling
|
b08dcc37f0
|
upd:代理商卡支付拆分，商户信息去除杂牌渠道，cbbank非必填
|
4 years ago |
|
yixian
|
dea531757c
|
3ds bug fix
|
4 years ago |
|
yixian
|
40c158de6e
|
3ds bug fix
|
4 years ago |
|
dulingling
|
f29f763696
|
add file
|
4 years ago |
|
dulingling
|
054632661f
|
upd:优化清算列表
|
4 years ago |
|
dulingling
|
27d8baf87a
|
upd:优化清算列表
|
4 years ago |
|
yixian
|
9c611ca562
|
upay invoice update
|
4 years ago |
|
dulingling
|
c00a6945da
|
upd：新增卡支付选项异常
|
4 years ago |
|
dulingling
|
5e2af30b4f
|
upd：新增卡支付选项异常
|
4 years ago |
|
dulingling
|
a00c6ec917
|
add:添加文件
|
4 years ago |
|
dulingling
|
7f517475dc
|
add:添加文件
|
4 years ago |
|
dulingling
|
3dc199a4a3
|
add:添加文本
|
4 years ago |
|
dulingling
|
2ceccc56da
|
add:添加文本
|
4 years ago |
yixian
|
ca82ab1a20
|
upay invoice update
|
4 years ago |
|
taylor.dang
|
e0a5f9b357
|
2.3.19
|
4 years ago |
|
taylor.dang
|
75d04d22a6
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
# src/main/ui/static/templates/payment/v1/card_pay.js
|
4 years ago |
|
yixian
|
4b5572e697
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
