luoyang
|
404b3825a8
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
luoyang
|
2272e5146b
|
add store_name
|
6 years ago |
yixian
|
444cc0427e
|
pom ver
|
6 years ago |
yixian
|
b4544295a8
|
pom ver
|
6 years ago |
yixian
|
f6eff7bb2e
|
secure file fix
|
6 years ago |
yixian
|
1178b46859
|
secure file fix
|
6 years ago |
luoyang
|
d05a3f9522
|
fix cb_bankpay
|
6 years ago |
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 |