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 |
|
taylor.dang
|
4413caa142
|
apidoc
|
5 years ago |
|
luoyang
|
f40804411e
|
fix 通知图片自适应问题
|
5 years ago |
|
luoyang
|
1166a67189
|
fix 通知图片大小问题
|
5 years ago |
|
luoyang
|
d160dd54f5
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
5307167a37
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
62371baf73
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
b17d6cb8ab
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
a1465a7a3b
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
de0215b823
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
8b8133d56a
|
fix 微信行业
|
5 years ago |
|
luoyang
|
8b45824440
|
fix 微信商户行业
|
5 years ago |
|
luoyang
|
1a737232b1
|
add 合规跳转商户端
|
5 years ago |
|
luoyang
|
2507d4b332
|
add 合规跳转商户端
|
5 years ago |
|
luoyang
|
17b5075d94
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/ui/static/payment/partner/templates/partners.html
# src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/GatewayApplicationMerchantDemoTest.java
|
5 years ago |
|
luoyang
|
c403863648
|
add RP商户类别交易统计
|
5 years ago |
|
luoyang
|
218e496b3d
|
fix gwt2 partner error
|
5 years ago |
|
luoyang
|
fd0b6c3e1d
|
fix gwt2 partner error
|
5 years ago |
|
luoyang
|
c981e127d2
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
d1fb4287f3
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
1dda04a9e5
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
5819cdc15b
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
ddedffa17f
|
fix 商户端transaction默认查询当天记录
|
5 years ago |
|
luoyang
|
8a45a4fffc
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
7457684dc5
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
8f1553163e
|
fix royalpay 完善行业信息
|
5 years ago |
|
luoyang
|
d24c861d37
|
fix royalpay 完善行业信息
|
5 years ago |
|
luoyang
|
06f2fc6e55
|
fix input css
|
5 years ago |
|
luoyang
|
70252f7f73
|
fix partners industry改为royalpay行业
|
5 years ago |
|
luoyang
|
4522cce652
|
fix partners industry改为royalpay行业
|
5 years ago |
|
luoyang
|
a4111e1fd4
|
fix 开通邮件、子商户chose改为more
|
5 years ago |
|
luoyang
|
40d044aca9
|
fix 开通邮件、子商户chose改为more
|
5 years ago |
|
luoyang
|
937ab0b05a
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
|
luoyang
|
3eee11c204
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
|
luoyang
|
0f5f1d66e0
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
|
dulingling
|
a60134abf3
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
a827171295
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
15bc6b96de
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
42946ee7af
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
yixian
|
14a7d49c81
|
build: 2.0.0 integration
|
5 years ago |
|
luoyang
|
f6ed3f1cea
|
add 单元测试
|
5 years ago |
|
luoyang
|
3d17c1fc82
|
fix parnters
|
5 years ago |
|
luoyang
|
792d54782f
|
fix parnters
|
5 years ago |
|
luoyang
|
2ef267d046
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
0626d466e5
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
7b6f71cf84
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
a9ee640f81
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
804fc0c9e8
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
c43a7e2816
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
1534515ee3
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
5af9537a6c
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
3e0a5f8690
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
1a9a653274
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
386b748ff4
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
luoyang
|
7b7f23fb68
|
add 商户自定义配置 hide_mch_device 隐藏设备
|
5 years ago |
|
luoyang
|
6efe8ce301
|
add 商户自定义配置 hide_mch_device 隐藏设备
|
5 years ago |
|
luoyang
|
3575037feb
|
fix 增加测试账号leoh
|
5 years ago |
|
luoyang
|
674ae4b1f8
|
fix 增加测试账号leoh
|
5 years ago |
|
luoyang
|
f9c5355635
|
add partner tarde clientMoniker shortName
|
5 years ago |
|
luoyang
|
4ea0eafdff
|
add partner tarde clientMoniker shortName
|
5 years ago |
|
luoyang
|
3d397c7f7e
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
f864b7c695
|
add level3_mch_config 自动配置
|
5 years ago |
|
yixian
|
98a8ea0e58
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
1522b5fd15
|
fix(settle ui): up update, email template update
|
5 years ago |
|
luoyang
|
8c75c1dc3b
|
fix ka商户子商户检索支持
|
5 years ago |
|
luoyang
|
e74a8327a9
|
fix ka商户子商户检索支持
|
5 years ago |
|
luoyang
|
97ea891948
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
04d44f8bef
|
add ka商户子商户检索支持
|
5 years ago |
|
yixian
|
4fdbd23058
|
fix(settle ui): title update
|
5 years ago |
|
yixian
|
45fd54ee6f
|
fix(settle ui): checkbox error
|
5 years ago |
|
yixian
|
0639015bbf
|
fix(settle ui): checkbox error
|
5 years ago |
|
yixian
|
18bfcd4ca3
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
160003e4d3
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
15e0d5262b
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
ec2fff9cb4
|
feat(settle ui): 测试环境清算邮件增加TEST标记
|
5 years ago |
|
yixian
|
33bb32c8e9
|
feat(settle ui): 清算发送UI修改
|
5 years ago |
|
yixian
|
1df9609149
|
feat(settle ui): 清算发送勾选发送是否标记已发送
|
5 years ago |
|
yixian
|
381e68467d
|
feat(settle ui): 清算发送勾选发送是否标记已发送
|
5 years ago |
|
yixian
|
61bd70e283
|
feat(settle ui): ui dockerfile
|
5 years ago |
|
yixian
|
132b7e15ca
|
feat(settle ui): ui dockerfile
|
5 years ago |
|
yixian
|
dc9b211ae3
|
feat(settle ui): 清算发送勾选发送批次，取消每日一次发送邮件限制，取消验证码
|
5 years ago |
|
yixian
|
7ee7ababe1
|
feat(settle ui): 清算发送勾选发送批次，取消每日一次发送邮件限制，取消验证码
|
5 years ago |
|
dulingling
|
8e763a191d
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
2b921b92c3
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
45a75ac289
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
929dcfb427
|
Upd:修改计算新老消费者人头数，每日数据生成逻辑
|
5 years ago |
|
dulingling
|
b19d14ab7a
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
482bb9721d
|
Upd:修改计算新老消费者人头数，每日数据生成逻辑
|
5 years ago |
|
luoyang
|
ff779faa60
|
add shortname rsvc
|
5 years ago |
|
luoyang
|
5fb3e409da
|
add shortname rsvc
|
5 years ago |
|
luoyang
|
366004e46c
|
delete app not found test
|
5 years ago |
|
luoyang
|
1e28b924ec
|
fix 跨境商城app 测试
|
5 years ago |
|
luoyang
|
7b0162ca44
|
fix 跨境商城app 测试
|
5 years ago |
|
luoyang
|
d355719e41
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
cd9d937a11
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
dfc7293005
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
381e26453c
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
8bec790b96
|
add rsvc返回CompanyName
|
5 years ago |
|
luoyang
|
c53575f30c
|
add rsvc返回CompanyName
|
5 years ago |
|
luoyang
|
f84f6266c1
|
add rsvc增加abn\acn字段
|
5 years ago |
