luoyang
|
6bf626ba16
|
fix 合伙人提成支持CBBankPay
|
6 years ago |
james.zhao
|
0eea9ee276
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
yixian
|
0f6267d783
|
secure file fix
|
6 years ago |
|
james.zhao
|
0ac0b8bdbd
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
yixian
|
223e9c708f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
da629ca16b
|
fix bug
|
6 years ago |
|
james.zhao
|
314ca1b500
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
james.zhao
|
d62ff090aa
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
b33f657e83
|
update
|
6 years ago |
|
james.zhao
|
93d1075140
|
update
|
6 years ago |
taylor.dang
|
b14b693a26
|
hanyin
|
6 years ago |
|
james.zhao
|
98a5852056
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
85eb7fecf1
|
yeepay update
|
6 years ago |
|
yixian
|
08f3d06e66
|
config key edit
|
6 years ago |
|
yixian
|
a4e62a3bb5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
2e732bb770
|
secure upload manual api
|
6 years ago |
yangkai
|
141389f712
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
7b7b7079fa
|
商户端清算详情批量导出
|
6 years ago |
lujian
|
54fa46567a
|
[fix]
|
6 years ago |
|
lujian
|
a76a1a4cf5
|
[fix]
|
6 years ago |
|
lujian
|
b928ef8dfe
|
[fix]商户简称限制15字符
|
6 years ago |
|
lujian
|
0897d2ddb2
|
[fix]商户简称限制15字符
|
6 years ago |
|
yixian
|
4bb9cc96da
|
secure upload
|
6 years ago |
|
yixian
|
bb5d6dbd25
|
secure upload
|
6 years ago |
|
yixian
|
e43b4b0f42
|
secure upload
|
6 years ago |
|
james.zhao
|
3ac82ce0e3
|
update
|
6 years ago |
|
james.zhao
|
2f3502b49d
|
update
|
6 years ago |
|
james.zhao
|
650e579f95
|
yeepay sub init
|
6 years ago |
|
luoyang
|
e2c20576e4
|
fix try_alerts & alerts display_amount
|
6 years ago |
|
luoyang
|
67f73d7f7c
|
fix try_alerts & alerts display_amount
|
6 years ago |
|
luoyang
|
e7037350e5
|
fix saveSubMerchantId refresh
|
6 years ago |
|
luoyang
|
e2f050450b
|
fix saveSubMerchantId refresh
|
6 years ago |
|
yangkai
|
22dfb16a14
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
7d8ec01b19
|
fix
|
6 years ago |
|
james.zhao
|
f4b11ffad6
|
立牌图片更新
|
6 years ago |
|
yangkai
|
02efeb6f01
|
1.商户账号修改白名单
2.添加禁用筛选
|
6 years ago |
|
lujian
|
3fc305ac40
|
[fix]
|
6 years ago |
|
james.zhao
|
c5e2103bee
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
d91961b6d2
|
fix bug
|
6 years ago |
|
yangkai
|
6168190732
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
01e3e8e234
|
hold commission
|
6 years ago |
|
yangkai
|
c0194eeca9
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yangkai
|
f324751ed6
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
2c1e895a57
|
cb_bankpay默认值
|
6 years ago |
|
yangkai
|
f530ac84df
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
6b68f0c563
|
bd提成下载&bd提成查询优化
|
6 years ago |
|
yangkai
|
504bac4041
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
cde5094995
|
fix
|
6 years ago |
|
yangkai
|
7b1464b547
|
注释组织管理中hf、yeepay
|
6 years ago |
|
yangkai
|
67a6e7cb16
|
注释hf、yeepay
|
6 years ago |
|
yangkai
|
fb3e829301
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
28a74d89e5
|
注释rpay+费率信息
|
6 years ago |
|
yangkai
|
4886dd214e
|
fix
|
6 years ago |
|
yangkai
|
1796a7fd3e
|
fix
|
6 years ago |
|
yangkai
|
cbf474e01a
|
cb_bankpay
|
6 years ago |
|
taylor.dang
|
d744e058c2
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
taylor.dang
|
65fabf3253
|
Merge branch 'develop'
|
6 years ago |
|
lujian
|
a0b5557f99
|
[fix]支付成功页修改
|
6 years ago |
|
lujian
|
d3585149c6
|
[fix]支付成功页修改
|
6 years ago |
|
yangkai
|
fcd07f15a9
|
init coupon processors
|
6 years ago |
|
james.zhao
|
9177b85bec
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
28ab73c425
|
fix bug
|
6 years ago |
|
james.zhao
|
fd7eddaf0f
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
543327f0ff
|
风控事件单增加禁用按钮
|
6 years ago |
|
luoyang
|
0d50ab284c
|
add 关闭清算输入原因
|
6 years ago |
|
luoyang
|
aed415d530
|
add 关闭清算输入原因
|
6 years ago |
|
luoyang
|
b7ce1b8924
|
add org_detail 商户/交易数据/提成 && 重构合伙人提成
|
6 years ago |
|
luoyang
|
9b2b7a6619
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
# src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
|
6 years ago |
|
luoyang
|
1b60ddb959
|
add org_detail 商户/交易数据/提成
|
6 years ago |
|
luoyang
|
8002da724c
|
add org_detail 商户/交易数据/提成
|
6 years ago |
|
luoyang
|
28742dae95
|
temp commit add org_detail 70%
|
6 years ago |
|
luoyang
|
0a7979ae96
|
Revert "重构royalpay合伙人提成"
This reverts commit 2ef721ea08.
|
6 years ago |
|
luoyang
|
b3eeb2f723
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
2ef721ea08
|
重构royalpay合伙人提成
|
6 years ago |
|
lujian
|
1dbd7dca0c
|
[fix]风控上传页面
|
6 years ago |
|
lujian
|
817e18e57a
|
[fix]风控人员上传页面
|
6 years ago |
|
taylor.dang
|
e94ee7e764
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
716e0ceffb
|
loading
|
6 years ago |
|
taylor.dang
|
967ebc5de5
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
64bad6d11d
|
add skip_clearing comfig
|
6 years ago |
|
luoyang
|
3c0c2aa944
|
add
|
6 years ago |
|
yixian
|
6fedebcf2f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
7f07641d56
|
spell error
|
6 years ago |
|
luoyang
|
56a9d2ff61
|
fix yeepay client_rate
|
6 years ago |
|
luoyang
|
2a31151322
|
fix yeepay client_rate
|
6 years ago |
|
luoyang
|
4539136699
|
fix
|
6 years ago |
|
luoyang
|
3acb017546
|
add docs/wechat sdk doc
|
6 years ago |
|
luoyang
|
dfea838272
|
fix
|
6 years ago |
|
luoyang
|
adc00b6c1f
|
add docs/wechat sdk
|
6 years ago |
|
james.zhao
|
4fc3efd8dc
|
Merge branch 'develop'
|
6 years ago |
|
lujian
|
c0db3b484a
|
[fix]支付成功页样式微调整
|
6 years ago |
|
taylor.dang
|
3a69c7a076
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
3f55c636a6
|
yeepay
|
6 years ago |
|
lujian
|
dbe47fbd67
|
[fix]注释支付成功页选项
|
6 years ago |
|
james.zhao
|
e33b0e6f85
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
lujian
|
bff6bcdcb2
|
[fix]邮件英文
|
6 years ago |
|
james.zhao
|
5ce3493760
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
a2ce6d0387
|
通知邮件用户名小写
|
6 years ago |
|
james.zhao
|
9c5f01958a
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
f8f2d4b254
|
update
|
6 years ago |
|
james.zhao
|
cbda1599be
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
baa99631d1
|
info邮箱密码
|
6 years ago |
|
lujian
|
5dd947a9db
|
[fix]新增支付成功页
|
6 years ago |
|
james.zhao
|
2b63577b34
|
风控调整log和e-charts
|
6 years ago |
|
james.zhao
|
d643f8cea7
|
风控 e-charts分析
|
6 years ago |
|
james.zhao
|
799cc6da48
|
email update
|
6 years ago |
|
lujian
|
50aae1323a
|
[fix]重复提交
|
6 years ago |
|
lujian
|
5a856b2f95
|
[fix]alipay材料动态显示
|
6 years ago |
|
lujian
|
22bb45a1e7
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
8cd3940c7c
|
[fix]风控处理流程显示
|
6 years ago |
|
taylor.dang
|
7f86b075c6
|
ignore
|
6 years ago |
|
yangkai
|
0c954ac7ac
|
商户退款预警白名单
|
6 years ago |
|
james.zhao
|
9e762fe398
|
update
|
6 years ago |
|
james.zhao
|
473aa0adf9
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
3789d483c3
|
取消日期限制
|
6 years ago |
|
lujian
|
333e496549
|
[fix]开放spms数据统计接口
|
6 years ago |
|
james.zhao
|
5fd561a578
|
css update yeepay
|
6 years ago |
|
lujian
|
03302dbdc5
|
[fix]excel添加设备名
|
6 years ago |
|
yangkai
|
8ce96a7a83
|
消费者黑名单
|
6 years ago |
|
yangkai
|
7f935392d4
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
e4bc549a60
|
绑定微信只显示一次
|
6 years ago |
|
taylor.dang
|
bbfcd63af5
|
通用商户号提醒
|
6 years ago |
|
james.zhao
|
490618f3b9
|
Update
|
6 years ago |
|
james.zhao
|
bf281bd7d8
|
Update
|
6 years ago |
|
james.zhao
|
56c0100abf
|
Update
|
6 years ago |
|
james.zhao
|
a4cad9ca04
|
Update
|
6 years ago |
|
james.zhao
|
5152b24816
|
风控邮件调整
|
6 years ago |
|
yangkai
|
7a44fa30c4
|
通用子商户号使用数量
|
6 years ago |
|
yangkai
|
dda910806a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
87a3849227
|
绑定微信二维码提醒注释
|
6 years ago |
|
lujian
|
7f2c6a99e8
|
[fix]
|
6 years ago |
|
lujian
|
d2a6c37489
|
update
|
6 years ago |
|
lujian
|
56602e9b09
|
update
|
6 years ago |
|
lujian
|
968c4848c5
|
update
|
6 years ago |
|
lujian
|
86d26f51d0
|
[fix]添加拒绝说明
|
6 years ago |
|
lujian
|
01e0c211ac
|
update
|
6 years ago |
|
lujian
|
43ad13ecea
|
[fix]
|
6 years ago |
|
lujian
|
0de5aa3780
|
update
|
6 years ago |
|
lujian
|
2ae7a49d5f
|
[fix]
|
6 years ago |
|
lujian
|
7ac0a012d6
|
update
|
6 years ago |
|
lujian
|
1b43e2ac4d
|
[fix]是否发送商户、超期提醒
|
6 years ago |
|
luoyang
|
f885797ac4
|
fix estimate monday
|
6 years ago |
|
luoyang
|
ea403c5072
|
fix estimate monday
|
6 years ago |
|
luoyang
|
de3d3d7b3b
|
add manage-provider
|
6 years ago |
|
luoyang
|
3e814c663a
|
fix estimate monday
|
6 years ago |
|
james.zhao
|
8580e7e4ce
|
Update
|
6 years ago |
|
taylor.dang
|
0fe72800bd
|
风控模块
|
6 years ago |
|
taylor.dang
|
87e956caba
|
风控模块
|
6 years ago |
|
lujian
|
06d4c3a512
|
[fix]
|
6 years ago |
|
lujian
|
4a563a148f
|
[fix]
|
6 years ago |
