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 |
|
yixian
|
df9d895b53
|
upay invoice update
|
4 years ago |
|
taylor.dang
|
9e24f066a8
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
taylor.dang
|
268309a200
|
支付宝报备异常信息
|
4 years ago |
|
yixian
|
69fdce12ca
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yixian
|
ad0b2c2dcb
|
upay invoice update
|
4 years ago |
|
dulingling
|
c28af838c7
|
upd:添加白名单文件
|
4 years ago |
|
taylor.dang
|
1975f21535
|
upay jasper
|
4 years ago |
|
taylor.dang
|
84c0b7e0f4
|
add eba file
|
4 years ago |
|
yixian
|
59987598ab
|
card permission api
|
5 years ago |
|
dulingling
|
a70adda7bf
|
upd:修复upay-pdf数据导出抱错问题
|
5 years ago |
|
dulingling
|
7e84672e6d
|
upd:修复upay-pdf数据导出抱错问题
|
5 years ago |
|
dulingling
|
4097603afb
|
upd:发票数据显示修改
|
5 years ago |
|
dulingling
|
5c3bec9795
|
upd:发票数据显示修改
|
5 years ago |
|
dulingling
|
20023e041d
|
upd:invoice
|
5 years ago |
|
dulingling
|
31b8312b4b
|
upd:invoice
|
5 years ago |
|
dulingling
|
3808804acd
|
upd:修改invoice模版显示信息
|
5 years ago |
|
dulingling
|
39c9d1fefd
|
upd:修改invoice模版显示信息
|
5 years ago |
dell
|
01d6c910a6
|
卡支付进件 必填项提示
|
5 years ago |
|
dell
|
e7694fb38e
|
卡支付进件 必填项提示
|
5 years ago |
|
dulingling
|
7f9bcd2cf3
|
upd：bd数据分析生成条件
|
5 years ago |
|
dulingling
|
eb194438f2
|
upd：bd数据分析生成条件
|
5 years ago |
|
dulingling
|
79f3a40c93
|
Upd:合规商户页面调整
|
5 years ago |
|
dulingling
|
f1d9b38223
|
Upd:商户合规列表调整查询逻辑以及显示信息
|
5 years ago |
|
dulingling
|
59d10bdc39
|
Upd:合规商户页面调整
|
5 years ago |
|
dulingling
|
7595fbd293
|
Upd:商户合规列表调整查询逻辑以及显示信息
|
5 years ago |
|
yixian
|
046d53efe8
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
yixian
|
c288c27fbe
|
3ds ui fix
|
5 years ago |
|
dulingling
|
d689d9fb1e
|
Upd:修改新apidemo
|
5 years ago |
|
dulingling
|
73bec21afe
|
Upd:修改新apidemo
|
5 years ago |
|
yixian
|
c00149ff9e
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
yixian
|
337abc6a92
|
3ds ui fix
|
5 years ago |
|
dulingling
|
3b48f9b7a0
|
fix
|
5 years ago |
|
dulingling
|
dd4d16b69f
|
fix
|
5 years ago |
|
dulingling
|
3519c44526
|
Upd:代理商下角色登陆不显示必须扫码绑定
|
5 years ago |
|
dulingling
|
48a0251c80
|
Upd:代理商下角色登陆不显示必须扫码绑定
|
5 years ago |
|
yixian
|
c312d8e02b
|
3ds ui fix
|
5 years ago |
|
yixian
|
b2e2adea2c
|
3ds ui fix
|
5 years ago |
|
dell
|
72a06e8987
|
账单文件清算时间、描述添加
|
5 years ago |
|
dell
|
3a68cc2058
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
dell
|
eb2cfa6656
|
账单文件清算时间、描述添加
|
5 years ago |
|
yixian
|
50b07d8fd4
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
ff63bfb131
|
3ds ui fix
|
5 years ago |
|
dulingling
|
a5115bb570
|
Upd:调整合规文件格式
|
5 years ago |
|
dulingling
|
1c7398858b
|
Upd:调整合规文件格式
|
5 years ago |
|
dulingling
|
36f1950d8b
|
Upd:调整合规文件格式
|
5 years ago |
|
dulingling
|
f7a995d11b
|
Upd:调整合规文件格式
|
5 years ago |
|
dulingling
|
3caa137153
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
d9745e48ef
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
f7cb663809
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
25dc8feb12
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
208d26174b
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
f90d4886be
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
48f2510508
|
Upd:修改合规文件
|
5 years ago |
|
dulingling
|
3f90fd76aa
|
Upd:修改合规文件
|
5 years ago |
|
taylor.dang
|
ab6de4d914
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
|
5 years ago |
|
taylor.dang
|
ef2bf3659b
|
invoice支持html转pdf
|
5 years ago |
|
yixian
|
c89893d3fb
|
3ds
|
5 years ago |
|
dulingling
|
c5b03910ec
|
新增费率配置修改
|
5 years ago |
|
dulingling
|
e5eb03cc2e
|
新增费率配置修改
|
5 years ago |
dalong306
|
18da986c6b
|
HTML 转pdf
|
5 years ago |
|
dalong306
|
75f18f6ffb
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
dalong306
|
5fb90658a8
|
HTML 转pdf
|
5 years ago |
|
dulingling
|
b76545996d
|
Upd:开放字段长度
|
5 years ago |
|
dulingling
|
264c01fcda
|
Upd:开放字段长度
|
5 years ago |
|
dulingling
|
1208f9c1d4
|
修改费率设定过期时间
|
5 years ago |
|
dulingling
|
0c0e6ae458
|
修改费率设定过期时间
|
5 years ago |
|
taylor.dang
|
fa1b667b76
|
remove unused dbp
|
5 years ago |
|
dulingling
|
47e1131c78
|
Upd:新增费率,过期之前所有有效时间内费率配置
|
5 years ago |
|
dulingling
|
50beb7d98b
|
Upd:新增费率,过期之前所有有效时间内费率配置
|
5 years ago |
|
dulingling
|
3b9bec751e
|
Upd:合规文件修改上传规则，通过后BD只可上传不删除合规文件
|
5 years ago |
|
dulingling
|
e574a6912c
|
Upd:合规文件修改上传规则，通过后BD只可上传不删除合规文件
|
5 years ago |
|
dulingling
|
3e8d4f3b43
|
Upd:卡合规文件-【优惠费率信】BD可重复提交上传
|
5 years ago |
|
dulingling
|
3f9e736a69
|
Upd:卡合规文件-【优惠费率信】BD可重复提交上传
|
5 years ago |
|
taylor.dang
|
692c4b9732
|
ignore
|
5 years ago |
|
taylor.dang
|
e0422b3568
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
1c2be391d3
|
fix
|
5 years ago |
|
taylor.dang
|
919c652bb5
|
dev
|
5 years ago |
|
taylor.dang
|
350a860ea7
|
dev
|
5 years ago |
|
yixian
|
3512717d19
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
a0ef915d06
|
documents update
|
5 years ago |
|
yixian
|
7e433befff
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
52646d40d1
|
documents update
|
5 years ago |
|
yixian
|
b9e11be87c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pom.xml
|
5 years ago |
|
yixian
|
0a426e4e7e
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
yixian
|
dea0bef60e
|
fix: settlement email issue. documents update
|
5 years ago |
|
taylor.dang
|
d22391b1e0
|
[Y] fix
|
5 years ago |
|
taylor.dang
|
67230aa14e
|
update
|
5 years ago |
|
taylor.dang
|
b605fc015c
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
5 years ago |
|
taylor.dang
|
d42a6fdcf6
|
[Y] update upay
|
5 years ago |
|
dulingling
|
98228ee3cd
|
Upd:信用卡合同国际费用显示修改
|
5 years ago |
|
dulingling
|
540fa49575
|
Upd:信用卡合同国际费用显示修改
|
5 years ago |
|
taylor.dang
|
df8c9c2a02
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
a1bbc19efd
|
fix: client modify process
|
5 years ago |
|
taylor.dang
|
167b3307ed
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
1453f0505a
|
[Y] stable 2.3.0
|
5 years ago |
|
dulingling
|
1a2269beca
|
Upd：合规流程审核，记录【提交制作合同】文字记录错误问题
|
5 years ago |
|
dulingling
|
e9b7bc3491
|
Upd：合规流程审核，记录【提交制作合同】文字记录错误问题
|
5 years ago |
|
yixian
|
477c7c356c
|
document update
|
5 years ago |
|
yixian
|
e2db068ebf
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
5ec4334f4e
|
document update
|
5 years ago |
luoyang
|
7bbbac0507
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
86751b2c94
|
update 2.2.32
|
5 years ago |
|
yixian
|
42c30ce9af
|
profile update
|
5 years ago |
|
luoyang
|
41f16fe4ad
|
update 2.2.32
|
5 years ago |
|
dulingling
|
9bc1101bdf
|
Upd：App每日交易额,进行小数保留2位
|
5 years ago |
|
luoyang
|
6ee320d329
|
fix abn
|
5 years ago |
|
luoyang
|
e0e23bf920
|
fix abn
|
5 years ago |
|
dulingling
|
00194266de
|
Upd:修改卡支付开关权限
|
5 years ago |
|
taylor.dang
|
a0214f7951
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
ce9628dc92
|
[N] 录入商户失败检查
|
5 years ago |
|
yixian
|
9720ab4fdc
|
document update
|
5 years ago |
|
yixian
|
2fcc2c3e6b
|
document update
|
5 years ago |
|
yixian
|
c6e44cb4c5
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
yixian
|
fe3cf04a0a
|
document update
|
5 years ago |
|
luoyang
|
d0bc236ce5
|
fix no wechat rate
|
5 years ago |
|
luoyang
|
759d2bf172
|
fix no wechat rate
|
5 years ago |
|
luoyang
|
c74fb2ac28
|
fix bd
|
5 years ago |
|
luoyang
|
6eaa98c908
|
fix bd
|
5 years ago |
|
luoyang
|
90636c5e7a
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
a366651127
|
fix bd
|
5 years ago |
|
luoyang
|
ac7a0c66a0
|
fix bd
|
5 years ago |
|
dulingling
|
3eb81da29e
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
ba97198b21
|
fix clean_days
|
5 years ago |
|
luoyang
|
b262cef7ce
|
fix clean_days
|
5 years ago |
|
dulingling
|
47a2076268
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
dulingling
|
79d249de95
|
Upd：信用卡审核流程优化
|
5 years ago |
|
luoyang
|
71c31c87bb
|
fix 上传合规文件后自动刷新
|
5 years ago |
|
luoyang
|
74bfd1dff0
|
fix 上传合规文件后自动刷新
|
5 years ago |
|
luoyang
|
668d0ca87d
|
fix bd kpi 大写
|
5 years ago |
|
luoyang
|
72964467c8
|
fix bd kpi 大写
|
5 years ago |
|
luoyang
|
4b59cf44e0
|
fix bd kpi 大写
|
5 years ago |
|
luoyang
|
58a954eebe
|
fix
|
5 years ago |
|
luoyang
|
cc7d1ae88e
|
fix
|
5 years ago |
|
luoyang
|
1d9f7022c4
|
fix
|
5 years ago |
|
luoyang
|
d49ba1508b
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
|
5 years ago |
|
luoyang
|
f333d3801b
|
add mw 合规文件上传多个、删除按钮
|
5 years ago |
|
luoyang
|
37b456b846
|
fix mw auth file 显示
|
5 years ago |
|
dulingling
|
e15aa56cb9
|
Upd:跨境/卡支付审核未申请修改提示
|
5 years ago |
|
dulingling
|
c040894429
|
Upd:跨境/卡支付审核未申请修改提示
|
5 years ago |
|
luoyang
|
7872bf960b
|
fix bd显示商户信息
|
5 years ago |
|
luoyang
|
ab2646e736
|
fix bd显示商户信息
|
5 years ago |
|
dulingling
|
e29d4cf0d9
|
Upd:升级版本
|
5 years ago |
|
dulingling
|
dbd3fe2d3e
|
Upd:升级版本
|
5 years ago |
|
dulingling
|
fabbe46168
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
f75ec29385
|
Upd:信用卡合规流程
|
5 years ago |
|
luoyang
|
32e1684f5c
|
fix add client_moniker
|
5 years ago |
|
luoyang
|
7eb50a8f5f
|
fix add client_moniker
|
5 years ago |
|
luoyang
|
33b2e61555
|
fix add client_moniker
|
5 years ago |
|
luoyang
|
4f19a86a09
|
fix add client_moniker
|
5 years ago |
|
luoyang
|
ea034cc54e
|
fix 同步代码
|
5 years ago |
|
luoyang
|
7094ac6c59
|
fix add card payment rates
|
5 years ago |
|
luoyang
|
74f67d8714
|
fix add card payment rates
|
5 years ago |
|
luoyang
|
45bc9a15d0
|
fix add card payment rates
|
5 years ago |
|
luoyang
|
d2cfdaf9ed
|
fix add card payment rates
|
5 years ago |
|
luoyang
|
eaaea090ca
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
2f07aadbef
|
Merge branch 'develop-card-compliance' into develop
|
5 years ago |
|
dulingling
|
f5111d47e2
|
Upd:信用卡合规流程
|
5 years ago |
|
luoyang
|
12420c0221
|
fix partner
|
5 years ago |
|
luoyang
|
17c166eb6e
|
fix partner
|
5 years ago |
|
luoyang
|
c300ef933b
|
fix yml
|
5 years ago |
|
luoyang
|
0eb6734c1d
|
fix 押金设置
|
5 years ago |
|
luoyang
|
f019290e2c
|
fix 合同上传按钮权限
|
5 years ago |
|
luoyang
|
52fe081aac
|
add 提交合规制作卡合同引导弹窗
|
5 years ago |
|
luoyang
|
9beff85f28
|
add upay_desc_file
|
5 years ago |
|
luoyang
|
2d48e63569
|
fix listpartners
|
5 years ago |
|
dulingling
|
674de95364
|
Merge remote-tracking branch 'origin/develop-card-compliance' into develop-card-compliance
|
5 years ago |
|
dulingling
|
1643d25ed2
|
Upd:信用卡合规流程
|
5 years ago |
|
luoyang
|
3e151f1ef8
|
fix
|
5 years ago |
|
dulingling
|
f6cbf6b35d
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
b94cad3e5f
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
c0710d4f38
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
4643a9ffa8
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
eabb8cba12
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
85ae04c0cd
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
5e8ac09f23
|
Upd:信用卡合规流程
|
5 years ago |
|
dulingling
|
884f05fa51
|
Merge branch 'develop-card-compliance' of https://pms.globalfreepay.com/source/royalpay.manage into develop-card-compliance
|
5 years ago |
|
dulingling
|
3b84cf18b6
|
Upd:信用卡合规流程
|
5 years ago |
|
luoyang
|
0984e606e2
|
fix common
|
5 years ago |
|
luoyang
|
d3ccf5f984
|
add 合规材料上传权限设置
|
5 years ago |
|
luoyang
|
6956fb0dc5
|
fix 风险等级只允许合规修改
|
5 years ago |
|
luoyang
|
b53bba9e2e
|
fix edit rate
|
5 years ago |
|
dulingling
|
64a751190b
|
Merge remote-tracking branch 'origin/develop-card-compliance' into develop-card-compliance
|
5 years ago |
|
dulingling
|
b12b62f73e
|
Upd:信用卡合规流程
|
5 years ago |
|
yixian
|
0713fa5071
|
documents docker update
|
5 years ago |
|
luoyang
|
22e8956d34
|
fix
|
5 years ago |
|
dulingling
|
5fcebd1235
|
Upd:信用卡合规流程
|
5 years ago |
|
yixian
|
02e4e184dc
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
8fccc950dd
|
documents
|
5 years ago |
|
luoyang
|
de5f731309
|
fix upay补充字段表增加合规相关信息
|
5 years ago |
|
dulingling
|
4d4ad058b1
|
Upd:信用卡合规流程
|
5 years ago |
|
luoyang
|
9d9499cfc8
|
add card 开通邮件
|
5 years ago |
|
luoyang
|
432ea24894
|
add citypartner support && upay application form
|
5 years ago |
|
luoyang
|
7dfb2f341b
|
add upay 商户invoice、settlement logs
|
5 years ago |
|
luoyang
|
982f24c64a
|
add mw合规文件、财务报表相关
|
5 years ago |
|
dulingling
|
a382441bf2
|
Upd:增加卡支付合规流程，BD提交资料，合规通过，合规打回
|
5 years ago |
|
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 |
|
luoyang
|
57e46bc170
|
add 商户类别交易趋势增加交易商户数数据
|
5 years ago |
|
luoyang
|
39812be745
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
a3b43675af
|
add 商户类别交易趋势增加百分比
|
5 years ago |
|
luoyang
|
b76f334637
|
fix 服务文件上传大小
|
5 years ago |
|
taylor.dang
|
7c15d9fd28
|
Merge branch 'develop'
|
5 years ago |
