hellolujian
|
af936510c3
|
[fix]
|
6 years ago |
james.zhao
|
7118cb25c5
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
8c207e5e97
|
update
|
6 years ago |
taylor.dang
|
8e109ad2e3
|
支付宝进件接口
|
6 years ago |
|
james.zhao
|
222edd7430
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
b23ad3d782
|
补发红包
|
6 years ago |
|
james.zhao
|
84a8773325
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
47ddb3e3d9
|
update
|
6 years ago |
|
james.zhao
|
84a8fe9d31
|
update
|
6 years ago |
|
james.zhao
|
fb89c08f95
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
887e3e2268
|
update
|
6 years ago |
|
james.zhao
|
ba79b580b0
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# src/main/ui/static/analysis/templates/cheat_monitor_risk.html
|
6 years ago |
|
james.zhao
|
cb99428bcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
254fdd9bb7
|
春节拆红包init
|
6 years ago |
lujian
|
ebaf807d23
|
[fix]
|
6 years ago |
|
lujian
|
db148d036f
|
[fix]wexin 解绑
|
6 years ago |
yixian
|
e576c675fd
|
ui bug fix
|
6 years ago |
|
yixian
|
6b6b26d540
|
ui bug fix
|
6 years ago |
|
yixian
|
64b6779ff8
|
ui bug fix
|
6 years ago |
|
yixian
|
375f0a3882
|
aba file remark from param outside
|
6 years ago |
|
lujian
|
7dc090209c
|
[fix]到账提醒通知页面
|
6 years ago |
luoyang
|
335290dc01
|
fix org commission year
|
6 years ago |
|
luoyang
|
48142e9f78
|
fix org commission year
|
6 years ago |
|
luoyang
|
75d93b5b56
|
fix
|
6 years ago |
|
luoyang
|
f9f7bb15bd
|
add app_style balance
|
6 years ago |
|
luoyang
|
e126326efa
|
add app_style balance
|
6 years ago |
yangkai
|
2a8feefb19
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
b5287202ae
|
fix
|
6 years ago |
|
yangkai
|
6bf22dabe7
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
3ad1a84834
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
ede4ec78ad
|
交易流水详情导出优化
|
6 years ago |
|
lujian
|
20c29056eb
|
[fix]
|
6 years ago |
|
lujian
|
4c7e643b59
|
[fix]
|
6 years ago |
|
lujian
|
8e7c57344d
|
[fix]
|
6 years ago |
|
lujian
|
4328c7ef5f
|
[fix]
|
6 years ago |
|
lujian
|
210a8aab48
|
[fix]
|
6 years ago |
|
lujian
|
a10d9ce765
|
[fix]
|
6 years ago |
|
lujian
|
efea8fc17a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
992037febc
|
[fix]
|
6 years ago |
|
lujian
|
acd366b849
|
[fix]支付宝调单修改
|
6 years ago |
|
lujian
|
f45b0985ea
|
[fix]
|
6 years ago |
|
james.zhao
|
8181a98074
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
3c5afc54f7
|
update
|
6 years ago |
|
james.zhao
|
50ea4adff3
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java
# src/main/ui/static/payment/partner/templates/partner_edit.html
|
6 years ago |
|
james.zhao
|
f24f75ca14
|
v3
|
6 years ago |
|
yangkai
|
c55232b23d
|
alipay数据导出
|
6 years ago |
|
lujian
|
9b210a224e
|
[fix]
|
6 years ago |
|
lujian
|
e2a5e95b8f
|
[fix]
|
6 years ago |
|
lujian
|
560bf07c69
|
[fix]账单活动
|
6 years ago |
|
yangkai
|
2eb65aa920
|
royalpay快捷网银通道-商户渠道切换
|
6 years ago |
|
yangkai
|
4264a2bb75
|
支付通道交易列表添加交易商户数跟开通该渠道商户数
|
6 years ago |
|
yangkai
|
516a5014dc
|
fix导出商户交易流水详情
|
6 years ago |
|
yangkai
|
c40e0d8bb1
|
商户清算文件pdf导出
|
6 years ago |
|
luoyang
|
280887a75e
|
subpartner add store_name
|
6 years ago |
|
luoyang
|
5f12f2fc94
|
subpartner add store_name
|
6 years ago |
|
luoyang
|
8d85414086
|
fix
|
6 years ago |
|
luoyang
|
cc10219ebf
|
store_name 必填
|
6 years ago |
|
luoyang
|
5619d21469
|
store_name 必填
|
6 years ago |
|
luoyang
|
32295102ce
|
增加合伙人提成定时任务
|
6 years ago |
|
luoyang
|
070c2f7586
|
增加定时任务，每月一号0点15分生成合伙人提成
|
6 years ago |
|
luoyang
|
8b306885bc
|
temp 注释重复生成合伙人提成 限制
|
6 years ago |
|
luoyang
|
a0e2600382
|
增加 store_name 提醒
|
6 years ago |
|
luoyang
|
8464e51c9f
|
增加 store_name提醒
|
6 years ago |
|
luoyang
|
6824fda05d
|
fix
|
6 years ago |
|
luoyang
|
a289abd2fa
|
fix
|
6 years ago |
|
taylor.dang
|
e026399f05
|
remove clean remark
|
6 years ago |
|
taylor.dang
|
98a04939bd
|
remove clean remark
|
6 years ago |
|
luoyang
|
b42d17309b
|
fix
|
6 years ago |
|
luoyang
|
45deeca762
|
add store_name
|
6 years ago |
|
luoyang
|
422891997a
|
add store_name
|
6 years ago |
|
luoyang
|
7f28b588f0
|
add store_name
|
6 years ago |
|
luoyang
|
352efe1f7f
|
add store_name
|
6 years ago |
|
luoyang
|
94f0d3a134
|
add store_name
|
6 years ago |
|
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 |
