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 |
|
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 |
|
lujian
|
39d76ade6b
|
[fix]
|
6 years ago |
|
james.zhao
|
ca864b4f0b
|
update
|
6 years ago |
|
james.zhao
|
ed84c506f9
|
update app message
|
6 years ago |
|
lujian
|
03bae40474
|
[fix]
|
6 years ago |
|
lujian
|
872d566449
|
[fix]
|
6 years ago |
|
lujian
|
bbc079e03f
|
[fix]风控接口修改
|
6 years ago |
|
lujian
|
ab2242079c
|
[fix]风控接口调整
|
6 years ago |
|
james.zhao
|
0620d4e3ed
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
7be33376ab
|
Yeepay Order Dev
|
6 years ago |
|
lujian
|
0322fc0570
|
[fix]风控对app端接口
|
6 years ago |
|
james.zhao
|
bd3aec323f
|
alipay风控
|
6 years ago |
|
lujian
|
7f16d92781
|
[fix]风控需求修改
|
6 years ago |
|
lujian
|
fd4c89fdbf
|
[fix]风控需求修改
|
6 years ago |
|
lujian
|
174064e245
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
285a436a91
|
[fix]风控需求修改
|
6 years ago |
|
james.zhao
|
38da65cf72
|
Yeepay init
|
6 years ago |
|
taylor.dang
|
4594faee58
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
eae6ff652d
|
退款审核
|
6 years ago |
|
taylor.dang
|
98a908a0b1
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
1383b71c69
|
fix
|
6 years ago |
|
taylor.dang
|
380b3ba16f
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
b65f706555
|
cashier退款审核
|
6 years ago |
|
taylor.dang
|
a474349e88
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
578bb08fe5
|
修复cashier openid bug
|
6 years ago |
|
taylor.dang
|
ee1c7ac4cd
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
62d2f90758
|
修复cashier退款审核流程失败,导致退款失败
|
6 years ago |
|
taylor.dang
|
fec38a1b07
|
Merge branch 'develop'
|
6 years ago |
|
lujian
|
58e3183d40
|
[fix]修复通用号调单商户不存在的情况
|
6 years ago |
|
luoyang
|
f6b6e144d8
|
fix 商户活跃度&&消费者排名 sql优化
|
6 years ago |
|
luoyang
|
05c5d7207a
|
fix 商户活跃度&&消费者排名sql优化
|
6 years ago |
|
luoyang
|
68a1942364
|
add && fix 商户号管理\优化SQL
|
6 years ago |
|
luoyang
|
c61eda605e
|
add 风控中心增加商务号管理
|
6 years ago |
|
luoyang
|
9b6f1e38dc
|
fix mapper client_rates&&orderAnalysis
|
6 years ago |
|
yixian
|
ea8eeafb1d
|
distribute bank rule edit: prefer to move no-CBA bank accounts to ANZ
|
6 years ago |
|
taylor.dang
|
f2104e2af5
|
Merge branch 'develop'
|
6 years ago |
|
yixian
|
2787bfba7c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
b6e7f93c4d
|
settle page, download single settle batch files
|
6 years ago |
|
taylor.dang
|
f34c498522
|
修改邮件密码
|
6 years ago |
|
james.zhao
|
23f6c6d5d9
|
Merge branch 'develop'
|
6 years ago |
|
lujian
|
b3ba95491b
|
[fix]
|
6 years ago |
|
james.zhao
|
bc2b4db557
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
637fe4a769
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
a18af881a5
|
控件显示
|
6 years ago |
|
james.zhao
|
d1ffa5216c
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
a40ea34bad
|
update
|
6 years ago |
|
james.zhao
|
bfb248a735
|
update
|
6 years ago |
|
james.zhao
|
9c2c2222a1
|
update
|
6 years ago |
|
james.zhao
|
9b9ee268e2
|
update
|
6 years ago |
|
james.zhao
|
0a87573272
|
Merge branch 'develop'
|
6 years ago |
|
lujian
|
6aeac6a5fe
|
[fix]gateway显示修改
|
6 years ago |
|
lujian
|
4268b28569
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
7370251a74
|
[fix]bd上传页面添加codekey
|
6 years ago |
|
yangkai
|
5f17203352
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
58aed6224a
|
注释BD自主申请列表
|
6 years ago |
|
lujian
|
36ac260230
|
[fix]风控最后一次上传，回家
|
6 years ago |
|
james.zhao
|
e84593be88
|
v2增加风控页面
|
6 years ago |
|
lujian
|
6580254327
|
[fix]风控渠道处理结果改成select
|
6 years ago |
|
yangkai
|
f6b1354a78
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
433c6ebf8d
|
bd添加商户自助申请
|
6 years ago |
|
lujian
|
b8265440ca
|
[fix]bd页面
|
6 years ago |
|
luoyang
|
98a301ba4a
|
add compliance partnerList register_time
|
6 years ago |
|
luoyang
|
88c55e0fc6
|
add compliance partnerList register_time
|
6 years ago |
|
yangkai
|
df3159e98a
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
77fe420e83
|
BD提成列表添加财务权限
|
6 years ago |
|
james.zhao
|
1ffbdc211c
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
9e0e2ca0c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
e80b79e194
|
风控业务
|
6 years ago |
|
luoyang
|
44383df2ca
|
fix guest
|
6 years ago |
|
luoyang
|
a8a1b2389f
|
fix guest
|
6 years ago |
|
luoyang
|
0776c9bfbe
|
fix guest
|
6 years ago |
|
luoyang
|
c461d64dff
|
fix guest
|
6 years ago |
|
yangkai
|
cfb7d39108
|
导航栏选项卡bug修改
|
6 years ago |
|
luoyang
|
3d321c1178
|
fix guest
|
6 years ago |
|
luoyang
|
749139c899
|
fix ja json
|
6 years ago |
|
luoyang
|
303eccdff9
|
fix
|
6 years ago |
|
james.zhao
|
c1b5e90235
|
Merge branch 'develop_risk' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
# src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
|
6 years ago |
|
james.zhao
|
9f9f5eb433
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
32be2ae64d
|
fix
|
6 years ago |
|
luoyang
|
fca560e90a
|
add guest login
|
6 years ago |
|
luoyang
|
26f18eebda
|
add guest login
|
6 years ago |
|
taylor.dang
|
ffcf74b518
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
taylor.dang
|
267c2526d2
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
665a3f6f1a
|
fix lastMonth
|
6 years ago |
|
taylor.dang
|
108557b00c
|
清算预估
|
6 years ago |
|
yixian
|
59259a6c25
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
b9d02da2cb
|
商户收取手续费提示
|
6 years ago |
|
luoyang
|
ffc9349ddf
|
close bd_leader <- 清算日管理
|
6 years ago |
|
luoyang
|
afc74060ea
|
add bd_leader <- clearing modules
|
6 years ago |
|
luoyang
|
630844a3c1
|
add bd_leader <- clearing modules
|
6 years ago |
|
luoyang
|
355ad56d02
|
add bd_leader <- clearing modules
|
6 years ago |
|
lujian
|
5454ec2ac0
|
[fix]
|
6 years ago |
|
james.zhao
|
33700aa64e
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
b9224b75e4
|
update
|
6 years ago |
|
james.zhao
|
d106fb8fd4
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
c0480d2c62
|
update
|
6 years ago |
|
james.zhao
|
e491aa006a
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
b8140db7e2
|
万圣节添加活动次数
|
6 years ago |
|
james.zhao
|
39874142d9
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
0bcbba9b23
|
万圣节添加活动次数
|
6 years ago |
|
james.zhao
|
f84bad16d0
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
c3ddf0e5d5
|
万圣节添加活动次数
|
6 years ago |
|
james.zhao
|
4158922e7c
|
万圣节添加活动次数
|
6 years ago |
|
james.zhao
|
bb0f0a37a5
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
4927d0998e
|
商户交易明细添加remark和gateway
|
6 years ago |
|
luoyang
|
28d94d9a64
|
add clearManager
|
6 years ago |
|
luoyang
|
992b9cec09
|
add clearManager
|
6 years ago |
|
luoyang
|
297d01a794
|
fix manage.html & menu_html
|
6 years ago |
|
luoyang
|
c789897636
|
fix manage.html & menu_html
|
6 years ago |
|
luoyang
|
ad83527c06
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
172a891421
|
fix
|
6 years ago |
|
yangkai
|
3e7a68c5b6
|
fix
|
6 years ago |
|
yangkai
|
f94c699284
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
c254ad6526
|
add main_menu icon
|
6 years ago |
|
yangkai
|
c2a383d60a
|
functions ui修改
|
6 years ago |
|
luoyang
|
56a5eb6aa5
|
fix main_menu
|
6 years ago |
|
yangkai
|
f1e11d178f
|
fix
|
6 years ago |
hellolujian
|
91d51e4629
|
[fix]
|
6 years ago |
|
hellolujian
|
4ee68e191f
|
[fix]
|
6 years ago |
|
hellolujian
|
0bb5b651b0
|
[fix]获取halloween活动当天订单信息
|
6 years ago |
|
james.zhao
|
403b31ef33
|
万圣节支付完成添加活动次数
|
6 years ago |
|
yangkai
|
4780926f00
|
[fix]permissions
|
6 years ago |
|
luoyang
|
8ae8685487
|
add permission function set role
|
6 years ago |
|
luoyang
|
408e5d9a30
|
fix manager2 js
|
6 years ago |
|
yangkai
|
59b80bd0b5
|
fix商户合规
|
6 years ago |
|
luoyang
|
6255041194
|
fix compliance listpartners
|
6 years ago |
|
yangkai
|
1e09f24b85
|
fix
|
6 years ago |
|
luoyang
|
410d501cda
|
fix managerv2 header select
|
6 years ago |
|
yangkai
|
6390273384
|
fix
|
6 years ago |
|
luoyang
|
005a33d84e
|
fix check has role
|
6 years ago |
|
taylor.dang
|
465c076027
|
dev
|
6 years ago |
|
taylor.dang
|
7eaac2d93b
|
1
|
6 years ago |
|
luoyang
|
a9a74e58cf
|
fix 领导决策加入合伙人管理
|
6 years ago |
|
luoyang
|
88b7fd4d23
|
add 临时合同
|
6 years ago |
|
luoyang
|
8496689ca0
|
add 临时合同
|
6 years ago |
|
luoyang
|
971f0ca39a
|
revert v1&v2-manager.html
|
6 years ago |
|
luoyang
|
7e62aeb6b2
|
fix v1&v2-manager.html
|
6 years ago |
|
luoyang
|
5c4e012148
|
fix v1&v2-manager.html
|
6 years ago |
|
yangkai
|
aa43765010
|
fix
|
6 years ago |
|
luoyang
|
d0ea610146
|
fix v2-manager.html one role
|
6 years ago |
|
luoyang
|
648cba58ce
|
Merge branch 'develop_newUI' into develop
|
6 years ago |
|
yangkai
|
2787998961
|
fix
|
6 years ago |
|
yangkai
|
43098e4550
|
fix
|
6 years ago |
|
luoyang
|
21ce0b9d53
|
fix v2-manager.html header rolenow
|
6 years ago |
|
luoyang
|
d5317359c5
|
fix v2-manager.html header rolenow
|
6 years ago |
|
luoyang
|
e1e6f8a8c5
|
fix v2-manager.html header display
|
6 years ago |
|
luoyang
|
f7a229cddd
|
fix v1-manager.html permission
|
6 years ago |
|
taylor.dang
|
01cfdcdb55
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
72d5b25c7d
|
fix
|
6 years ago |
|
luoyang
|
81e1584c9a
|
fix v1-manager.html
|
6 years ago |
|
taylor.dang
|
f257c60950
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
8b813a0e51
|
费率自动延期
|
6 years ago |
|
yangkai
|
8ff1cc35af
|
fix
|
6 years ago |
|
yangkai
|
7fc914f6ce
|
fix
|
6 years ago |
|
luoyang
|
e19685ad99
|
fix v2-manager.html perimission
|
6 years ago |
|
luoyang
|
ec010193ce
|
fix v2-manager.html role
|
6 years ago |
|
luoyang
|
28a5d26c4f
|
fix v2-manager.html permission
|
6 years ago |
|
yangkai
|
ac7836da81
|
页面头部修改
|
6 years ago |
|
luoyang
|
465772c5dc
|
fix v1-manager.html & v2-manager.html
|
6 years ago |
|
yangkai
|
9c28923818
|
fix
|
6 years ago |
|
yangkai
|
b5b6a8b286
|
fix
|
6 years ago |
|
luoyang
|
7d7ee28a4b
|
Merge remote-tracking branch 'origin/develop_newUI' into develop_newUI
|
6 years ago |
|
luoyang
|
c63931939f
|
fix v1-manager.html
|
6 years ago |
|
yangkai
|
55879c5c20
|
交易管理ui调整
|
6 years ago |
|
luoyang
|
919c7783be
|
fix boot
|
6 years ago |
|
hellolujian
|
3760a13d94
|
[fix]
|
6 years ago |
|
james.zhao
|
6f060fd947
|
update
|
6 years ago |
|
hellolujian
|
d1c0e36e63
|
[fix]
|
6 years ago |
|
hellolujian
|
b069c37ea9
|
[fix]
|
6 years ago |
|
hellolujian
|
0abda9f48a
|
[fix]
|
6 years ago |
|
yangkai
|
a0d7a4c631
|
[fix]商户统计
|
6 years ago |
|
james.zhao
|
99f74b1ee8
|
update
|
6 years ago |
|
luoyang
|
643e8fc533
|
fix servant
|
6 years ago |
|
luoyang
|
dd34208113
|
fix servant
|
6 years ago |
|
luoyang
|
24555404a2
|
fix servant
|
6 years ago |
|
james.zhao
|
44fdc278ba
|
风控材料上传新界面
|
6 years ago |
|
luoyang
|
784bd85360
|
change new ROLE & permission role
|
6 years ago |
|
hellolujian
|
91e9574eb9
|
[fix]
|
6 years ago |
|
hellolujian
|
bf5467a5ad
|
[fix]
|
6 years ago |
|
luoyang
|
adce31c4bf
|
fix gatewayjs redirect
|
6 years ago |
|
luoyang
|
162f4a7ef4
|
fix gatewayjs redirect
|
6 years ago |
|
hellolujian
|
8b0dc466e9
|
[fix]
|
6 years ago |
|
hellolujian
|
91648bcd96
|
[fix]
|
6 years ago |
|
james.zhao
|
511904767c
|
Merge remote-tracking branch 'origin/develop_risk' into develop_risk
|
6 years ago |
|
james.zhao
|
b5e44dbfc5
|
update
|
6 years ago |
|
hellolujian
|
5daa8ab0b3
|
[fix]
|
6 years ago |
|
yixian
|
2d8bf8931d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
39e44c076d
|
ABAfile comment update
|
6 years ago |
|
james.zhao
|
76d20b07a0
|
Merge remote-tracking branch 'origin/develop_risk' into develop_risk
|
6 years ago |
|
james.zhao
|
6ec6235ce0
|
update
|
6 years ago |
|
taylor.dang
|
eb77903ec1
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
30e1561315
|
app rpay订单查询
|
6 years ago |
|
hellolujian
|
2efd7a04a7
|
[fix]更新已处理状态
|
6 years ago |
|
hellolujian
|
b3c20a18f1
|
[fix]
|
6 years ago |
|
hellolujian
|
6c4288e3b6
|
[fix]
|
6 years ago |
|
hellolujian
|
f5e9503547
|
[fix]
|
6 years ago |
|
james.zhao
|
5401e48eed
|
update
|
6 years ago |
|
james.zhao
|
51e2c14fff
|
Merge remote-tracking branch 'origin/develop_risk' into develop_risk
|
6 years ago |
|
hellolujian
|
c2587d1fa4
|
[fix]修复前端按钮显示，一键下载
|
6 years ago |
|
james.zhao
|
c2397259e0
|
文件上传页面增加前端限制
|
6 years ago |
|
james.zhao
|
c29d18b0a4
|
材料更新描述
|
6 years ago |
|
james.zhao
|
e96db30864
|
fix
|
6 years ago |
|
james.zhao
|
a7677a8cee
|
update
|
6 years ago |
|
hellolujian
|
01f94ad1df
|
update
|
6 years ago |
|
hellolujian
|
e4a9ed5e3f
|
Merge remote-tracking branch 'origin/develop_risk' into develop_risk
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java
# src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
|
6 years ago |
|
hellolujian
|
336ba5070b
|
Merge branch 'develop_risk' of E:\globalPay\manage_develop_9009\royalpay.manage with conflicts.
|
6 years ago |
|
james.zhao
|
a92f4876f1
|
提醒填写风控材料的邮件
|
6 years ago |
|
james.zhao
|
1eb2811503
|
风控邮件更新
|
6 years ago |
|
luoyang
|
3ac5703edc
|
fix rpay+switchMerchantSettle
|
6 years ago |
|
luoyang
|
bf8a94a620
|
fix rpay+switchMerchantSettle
|
6 years ago |
|
taylor.dang
|
52612cad65
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
671c27649f
|
update
|
6 years ago |
|
james.zhao
|
ccbd5a9c3a
|
风控邮件
|
6 years ago |
|
james.zhao
|
dd11125c0f
|
Merge remote-tracking branch 'origin/develop_risk' into develop_risk
|
6 years ago |
|
james.zhao
|
f61cd5be0b
|
update
|
6 years ago |
|
hellolujian
|
f99a5a6ff5
|
update
|
6 years ago |
|
luoyang
|
546df5fef0
|
fix rpay+ modifySurchargeConfig on
|
6 years ago |
|
hellolujian
|
d0532b21da
|
[fix]完善风控业务流程
|
6 years ago |
|
hellolujian
|
8502b52c3f
|
[fix]风控业务流程
|
6 years ago |
|
luoyang
|
7c0bc3f019
|
add version controller
|
6 years ago |
|
taylor.dang
|
a6042c523e
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
3ede159d97
|
fix
|
6 years ago |
|
yangkai
|
b947cc63a0
|
fix
|
6 years ago |
|
luoyang
|
93f2af4d52
|
fix BD-ng-click
|
6 years ago |
|
luoyang
|
3ff563307f
|
add ui-route && permission
|
6 years ago |
|
yangkai
|
1fdbce200c
|
fix
|
6 years ago |
|
luoyang
|
53f60669a3
|
fix something
|
6 years ago |
|
luoyang
|
419758b21f
|
fix ui-view
|
6 years ago |
|
yangkai
|
54b166a8f5
|
Main_Menu页面
|
6 years ago |
|
luoyang
|
62e91a49cc
|
add copyright
|
6 years ago |
|
taylor.dang
|
5dbcfeedeb
|
fix
|
6 years ago |
|
taylor.dang
|
2a8ffb5475
|
fix
|
6 years ago |
|
taylor.dang
|
cd0695f33b
|
fix
|
6 years ago |
|
luoyang
|
2e207ae8a1
|
add copyright
|
6 years ago |
|
hellolujian
|
c6aafed536
|
[fix]风控事件注册页面
|
6 years ago |
|
hellolujian
|
0bb6ad8e08
|
[feat]初始化风控业务流程模块
|
6 years ago |
|
taylor.dang
|
7cdad1807d
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
7b5ed75947
|
managerMenu.js test
|
6 years ago |
|
yangkai
|
9b4900cfe0
|
携程卡券核销添加备注
|
6 years ago |
|
luoyang
|
54f62e4c86
|
add managerMenu.js
|
6 years ago |
|
luoyang
|
17045552f0
|
new Manage UI - manage.html
|
6 years ago |
|
taylor.dang
|
377ff2659b
|
Merge branch 'develop'
|
6 years ago |
|
hellolujian
|
c2c6eec7c1
|
[fix]更正royalpay图标
|
6 years ago |
|
hellolujian
|
eed0365d5b
|
[fix]optimize getBDSaleList
|
6 years ago |
|
hellolujian
|
2baadc3bd8
|
[fix]optimize listorders
|
6 years ago |
|
taylor.dang
|
64d9ce4048
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
dc0d79a4c1
|
remove point dialog
|
6 years ago |
ying
|
04662963c5
|
fix api.js
|
6 years ago |
|
taylor.dang
|
0de6b19eed
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
09cd0ffa32
|
rpay+ 订单金额额外处理 + 账单创建时间处理
|
6 years ago |
|
taylor.dang
|
9c5a7e4ae9
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
5e495fb765
|
fix
|
6 years ago |
|
taylor.dang
|
ea67c86fff
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
caa9ae63be
|
修复新增费率异常+ 暂不启用rpay+费率修改api
|
6 years ago |
|
taylor.dang
|
c7b8502c29
|
fix订单流水时间为系统创建transaction时间
|
6 years ago |
|
taylor.dang
|
a953b9042d
|
fix订单流水时间为系统创建transaction时间
|
6 years ago |
|
yixian
|
2e8ba2ab29
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
bb6a296387
|
手动清算提现规则调整
|
6 years ago |
|
luoyang
|
7fd4d515e0
|
暂时关闭clearing自动续约时更新Rpay+
|
6 years ago |
|
luoyang
|
ff14cdd63b
|
暂时关闭clearing自动续约时更新Rpay+
|
6 years ago |
|
hellolujian
|
d120f8156b
|
[fix]
|
6 years ago |
|
hellolujian
|
c7d6ad769a
|
[fix]
|
6 years ago |
|
hellolujian
|
74892d8908
|
[fix]
|
6 years ago |
|
luoyang
|
4738df4050
|
fix rpay+ merchant
|
6 years ago |
|
hellolujian
|
f0b17d8504
|
[fix]新增transaction_fee字段
|
6 years ago |
|
hellolujian
|
447fea52e6
|
[fix]
|
6 years ago |
|
hellolujian
|
7401a9e414
|
[fix]
|
6 years ago |
|
hellolujian
|
3fac4f2c58
|
[fix]优化SQL
|
6 years ago |
|
hellolujian
|
d8d6855d13
|
[fix]优化sql
|
6 years ago |
|
luoyang
|
a78fd1542d
|
fix rate_warning
|
6 years ago |
|
luoyang
|
a2de0ea35e
|
fix Dashboard TopOrderFee
|
6 years ago |
|
luoyang
|
c5e246c538
|
fix Rpay-merchant
|
6 years ago |
|
yangkai
|
6ded918861
|
修改url
|
6 years ago |
|
yangkai
|
fb127556c3
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
62787070db
|
重置pine商户下账户密码
|
6 years ago |
|
luoyang
|
f97047476e
|
fix dev
|
6 years ago |
|
luoyang
|
71bad3b7c3
|
add
|
6 years ago |
|
luoyang
|
aba4101dd7
|
add
|
6 years ago |
kira
|
33bca80450
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
3a7241360f
|
update
|
6 years ago |
|
kira
|
d6c53c115b
|
postpone client rate
|
6 years ago |
|
luoyang
|
4507310f8b
|
fix modify sur
|
6 years ago |
|
kira
|
701e1ceb80
|
update
|
6 years ago |
|
kira
|
58fb928ef2
|
update
|
6 years ago |
|
luoyang
|
aa006c3562
|
fix modify sur
|
6 years ago |
|
luoyang
|
9d0fb270fe
|
fix modify sur
|
6 years ago |
|
luoyang
|
6c616d5795
|
fix modify sur
|
6 years ago |
|
luoyang
|
234b07c54b
|
Merge branch 'add_rpay_change_rate' into develop
|
6 years ago |
|
luoyang
|
566ffb2446
|
add modify sur
|
6 years ago |
|
hellolujian
|
562840ceda
|
[fix]商户端支付秘钥支持刷新
|
6 years ago |
|
luoyang
|
aa2e4bc37e
|
fix select_nap
|
6 years ago |
|
luoyang
|
441800b599
|
add select_nap
|
6 years ago |
|
luoyang
|
90c5bfc5bd
|
Merge branch 'add_nap_select' into develop
|
6 years ago |
|
luoyang
|
3959b7c071
|
add select_nap
|
6 years ago |
|
hellolujian
|
053d85d61e
|
[fix]notify log页面添加查询条件及显示字段
|
6 years ago |
|
luoyang
|
eac17d2434
|
fix rpay - remark_alter
|
6 years ago |
|
luoyang
|
6ea7c26d96
|
fix rpay - remark_alter
|
6 years ago |
|
luoyang
|
a6ea30b8ca
|
add client_partner_detail googleMap
|
6 years ago |
|
luoyang
|
8e0d916897
|
add client_partner_detail googleMap
|
6 years ago |
|
luoyang
|
eb24dd7ad4
|
fix wx_settlements orderby desc
|
6 years ago |
|
taylor.dang
|
ed1b811eb8
|
清算预估
|
6 years ago |
|
yangkai
|
825b41a8d2
|
支付完成弹窗显示
|
6 years ago |
|
taylor.dang
|
c4404978da
|
fix
|
6 years ago |
|
yangkai
|
351efaaec2
|
开放其他商户参与活动
|
6 years ago |
|
luoyang
|
e6564c9ada
|
fix rpay+ icon
|
6 years ago |
|
hellolujian
|
fed8e1f8e9
|
[fix]添加Rpay+交易额显示
|
6 years ago |
|
taylor.dang
|
5718465f3f
|
rpay
|
6 years ago |
|
taylor.dang
|
66ead63d38
|
rpay
|
6 years ago |
|
yangkai
|
c90d1e2c5a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
e9173949e1
|
修改支付完成弹窗
|
6 years ago |
|
luoyang
|
348dd76fd6
|
fix rpay+ icon
|
6 years ago |
|
luoyang
|
f7d1ffb837
|
fix rpay+ icon
|
6 years ago |
|
kira
|
a512a449fa
|
rpay payment success page
|
6 years ago |
|
taylor.dang
|
7c073d79b9
|
rpay
|
6 years ago |
|
taylor.dang
|
7ac83ccf01
|
rpay
|
6 years ago |
|
hellolujian
|
dca2b18ea0
|
[fix]添加Rpay+图标
|
6 years ago |
|
hellolujian
|
535267fa96
|
[fix]添加Rpay+图标
|
6 years ago |
|
hellolujian
|
5b26497cd8
|
[fix]
|
6 years ago |
|
hellolujian
|
2dbe7e3b69
|
[fix]添加rpay+图标
|
6 years ago |
|
kira
|
aa5df412f0
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
939e29a952
|
update
|
6 years ago |
|
kira
|
03818e25ee
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
hellolujian
|
158276ecff
|
[fix]显示总商户数，包括禁用的
|
6 years ago |
|
kira
|
2478d14b6e
|
rpay js check order status
|
6 years ago |
|
hellolujian
|
7ff09c78cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
hellolujian
|
f1ea323c28
|
[fix]channel添加Rpay
|
6 years ago |
|
luoyang
|
4d39963f98
|
fix merchant
|
6 years ago |
|
luoyang
|
6e60424265
|
fix merchant_id
|
6 years ago |
|
yangkai
|
a075614c7b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
ba41845c03
|
加@Resource引入RoyalPayCMSSupport
|
6 years ago |
|
luoyang
|
c722acd720
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
f72b439353
|
change Rpay merchant
|
6 years ago |
|
luoyang
|
3ff88287bf
|
Merge branch 'rpay_merchant_change' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
|
6 years ago |
|
kira
|
2436757e1d
|
update
|
6 years ago |
|
luoyang
|
93a4ff7bed
|
add 100%
|
6 years ago |
|
kira
|
d327dce76c
|
update
|
6 years ago |
|
kira
|
8f9954f2ee
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/partner/templates/partner_new_rate.html
# src/main/ui/static/templates/rpay/v1/payment.js
|
6 years ago |
|
yixian
|
7f8b16cd29
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
4398264977
|
image
|
6 years ago |
|
yixian
|
aa1b7ae21f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
f3bfd8d0ec
|
img
|
6 years ago |
|
taylor.dang
|
92dd21c447
|
fix
|
6 years ago |
|
taylor.dang
|
90b71373d6
|
fix
|
6 years ago |
|
taylor.dang
|
977849df93
|
fix
|
6 years ago |
|
taylor.dang
|
45fd38b071
|
fix
|
6 years ago |
|
yangkai
|
f826867191
|
缩小抽奖奖励弹窗
|
6 years ago |
|
luoyang
|
1a4d406f03
|
add 65%
|
6 years ago |
|
luoyang
|
086873f98a
|
add 55%
|
6 years ago |
|
yangkai
|
ec30db765b
|
app图标cmsHost修改
|
6 years ago |
|
yangkai
|
0b70366c7e
|
添加app图标管理功能
|
6 years ago |
|
luoyang
|
6cd99c841c
|
fix merchant
|
6 years ago |
|
luoyang
|
de55f0b10c
|
fix merchant
|
6 years ago |
|
luoyang
|
48247667ef
|
add 40%
|
6 years ago |
|
kira
|
94c971baeb
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
6a368f7b65
|
add customerId
|
6 years ago |
|
luoyang
|
6929fa2ebb
|
fix rpay clearing html
|
6 years ago |
|
luoyang
|
aea70ff828
|
fix rpay clearing html
|
6 years ago |
|
luoyang
|
8667dbee0e
|
fix rpay clearing html
|
6 years ago |
|
kira
|
d215a7fa8a
|
fix
|
6 years ago |
|
kira
|
2f0816573f
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
|
6 years ago |
|
luoyang
|
962fb6c192
|
fix rpay merchant Id displayname
|
6 years ago |
|
luoyang
|
7ba97fe686
|
fix properties +rpay
|
6 years ago |
|
luoyang
|
8c5e51982d
|
add 10%
|
6 years ago |
|
taylor.dang
|
5880537788
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
taylor.dang
|
ea3ba4a5e0
|
fix
|
6 years ago |
|
kira
|
ce3e896e89
|
add rpay merchant
|
6 years ago |
|
kira
|
98332d95a5
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
# src/main/resources/application-rpay.properties
# src/main/ui/static/payment/partner/partner-manage.js
# src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
|
6 years ago |
|
kira
|
09755b167c
|
modify
|
6 years ago |
|
luoyang
|
49548f0137
|
add 5%
|
6 years ago |
|
taylor.dang
|
ee0854002e
|
[Y] 商户地理位置定时任务
|
6 years ago |
|
taylor.dang
|
48c347a55a
|
[Y] 初始化商户地理位置信息
|
6 years ago |
|
taylor.dang
|
2ebe5a2eb7
|
[Y] 初始化商户地理位置信息
|
6 years ago |
|
kira
|
10a0a6f0ce
|
add rpay
|
6 years ago |
|
kira
|
43ab6507d6
|
tmp
|
6 years ago |
|
kira
|
4f73be6d88
|
Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
|
6 years ago |
|
kira
|
deebb88a2c
|
update
|
6 years ago |
|
taylor.dang
|
da29d53dc9
|
[Y] 新增恢复商户功能
|
6 years ago |
|
luoyang
|
4d1e4b3aa1
|
update revert partner
|
6 years ago |
|
luoyang
|
d6c4a5aafb
|
update modify.sql
|
6 years ago |
|
luoyang
|
1987cc09f8
|
update merchant
|
6 years ago |
|
kira
|
d416b2265f
|
tmp
|
6 years ago |
|
yixian
|
2a6cbe1b69
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
b70b34f55f
|
Merge branch 'hotfix-mailpassword' into develop
|
6 years ago |
|
yixian
|
25fbddacd9
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
61dc277d62
|
settlement mail password source
|
6 years ago |
|
luoyang
|
8eb861edf3
|
update rpay html
|
6 years ago |
|
taylor.dang
|
137d1cf71e
|
[Y] 红包发送历史关联
|
6 years ago |
|
kira
|
dd6392c625
|
update
|
6 years ago |
|
kira
|
00775570b9
|
Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
|
6 years ago |
|
luoyang
|
7ec5f96087
|
rollback
|
6 years ago |
|
kira
|
ebf61c187f
|
add rpay
|
6 years ago |
|
hellolujian
|
aadf58d211
|
[fix]红包关联globalpay_openid
|
6 years ago |
|
yixian
|
c0ec8defea
|
ATO Report,
|
6 years ago |
|
taylor.dang
|
d23de1a885
|
fix
|
6 years ago |
|
taylor.dang
|
3e4085bbf4
|
mybatis 延迟加载启动
|
6 years ago |
|
taylor.dang
|
b72cba1a1d
|
mybatis 延迟加载启动
|
6 years ago |
|
kira
|
bb4d1f9209
|
Revert "add rpoy+"
This reverts commit 94aa36f657.
|
6 years ago |
|
kira
|
0f04e357e4
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
luoyang
|
175cfdd6a0
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
354985e242
|
rollback
|
6 years ago |
|
kira
|
1bf8b6cd22
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a0e5de2690
|
update
|
6 years ago |
|
luoyang
|
94aa36f657
|
add rpoy+
|
6 years ago |
|
taylor.dang
|
a7b53e63bf
|
fix bugs
|
6 years ago |
|
taylor.dang
|
aa409635e8
|
fix
|
6 years ago |
|
taylor.dang
|
23249eea35
|
红包活动
|
6 years ago |
|
taylor.dang
|
08ec9840c5
|
红包活动
|
6 years ago |
|
yangkai
|
4993c7bff0
|
支付完成弹窗修改
|
6 years ago |
|
taylor.dang
|
c8bdb1dd10
|
fix
|
6 years ago |
|
yangkai
|
584fb887c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
0cdbe2add4
|
支付后弹出抽奖跳转弹窗
|
6 years ago |
|
luoyang
|
49cf2a4b9b
|
fix risk
|
6 years ago |
|
luoyang
|
f509f81377
|
fix risk
|
6 years ago |
|
yangkai
|
232c19af7b
|
update
|
6 years ago |
|
yangkai
|
02d2e6fd91
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
1f976b3450
|
只允许pine商户参与支付抽奖活动
|
6 years ago |
|
kira
|
d6c7705e7e
|
update
|
6 years ago |
|
kira
|
d0dcce073d
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
7d7931ceff
|
update
|
6 years ago |
|
yangkai
|
fa225a873b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
8bf48d053e
|
支付完成后添加抽奖次数
|
6 years ago |
|
luoyang
|
d8b8a1bc81
|
fix risk
|
6 years ago |
|
kira
|
e41a373fc8
|
tmp
|
6 years ago |
|
kira
|
4afa869493
|
update
|
6 years ago |
|
kira
|
9148766cc5
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
d85f1c80df
|
remove alert
|
6 years ago |
|
kira
|
89cbea2602
|
update
|
6 years ago |
|
luoyang
|
eddcef50db
|
fix risk
|
6 years ago |
|
luoyang
|
7157b674f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
25bd733528
|
add act 10-31
|
6 years ago |
|
kira
|
999df149c0
|
fixbug parent client invalid
|
6 years ago |
|
kira
|
9ba1500808
|
update
|
6 years ago |
|
kira
|
32aad0f13c
|
update
|
6 years ago |
|
kira
|
6bf31521bf
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
14e130316e
|
update
|
6 years ago |
|
luoyang
|
1af0a9890e
|
add cms reference
|
6 years ago |
|
luoyang
|
823fe881a8
|
fix asd
|
6 years ago |
|
luoyang
|
01dcc58ccb
|
fix asd
|
6 years ago |
|
luoyang
|
9d05bcd948
|
fix asd
|
6 years ago |
|
luoyang
|
94c1d06497
|
fix asd
|
6 years ago |
|
luoyang
|
efd2185622
|
add asd
|
6 years ago |
|
kira
|
39a6658b15
|
app style
|
6 years ago |
|
luoyang
|
000a66a10b
|
fix clickcopy
|
6 years ago |
|
luoyang
|
6081636870
|
add hf_test show 3
|
6 years ago |
|
yangkai
|
5c6125c14a
|
bd开放修改Short Name、Business Name权限
|
6 years ago |
|
luoyang
|
5166240edf
|
add clearing_estimate : hf
|
6 years ago |
|
taylor.dang
|
348bcdf8dc
|
[y]修复禁用商户提醒 & 黑名单商户查询
|
6 years ago |
|
yixian
|
2b6f6b88e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
8321cfb724
|
ATO Report,
order channel support
|
6 years ago |
|
luoyang
|
b1946bc759
|
fix partnerInfo
|
6 years ago |
|
luoyang
|
384475da74
|
add partnerInfo - copy icon
|
6 years ago |
|
kira
|
207bb0f980
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
7dedb7aaf5
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
24b286198c
|
update
|
6 years ago |
|
taylor.dang
|
01d5c6129d
|
log
|
6 years ago |
|
kira
|
6c88a7ce0a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
b4f595c34c
|
add settle mail
|
6 years ago |
|
luoyang
|
0679f626ce
|
fix clearing
|
6 years ago |
|
luoyang
|
0670a41ee9
|
fix clearing
|
6 years ago |
|
kira
|
dd2d72e177
|
update hf industry
|
6 years ago |
|
kira
|
de4aee60ed
|
update hf industry
|
6 years ago |
|
kira
|
7a0bfcab9a
|
test HF
|
6 years ago |
|
luoyang
|
b10b343679
|
fix clearing
|
6 years ago |
|
taylor.dang
|
c6f214559d
|
支付宝进件信息
|
6 years ago |
|
kira
|
e2b9855082
|
add css
|
6 years ago |
|
yangkai
|
9e6affb143
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
fc22178c03
|
邮件模板添加货币类型
|
6 years ago |
|
luoyang
|
6d8e22c8ca
|
fix hf
|
6 years ago |
|
luoyang
|
e4a92a209b
|
fix hf
|
6 years ago |
|
luoyang
|
ca9dca7abc
|
fix hf
|
6 years ago |
|
luoyang
|
f14c1bda2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
71eeb42bb2
|
fix hf
|
6 years ago |
|
kira
|
555561291e
|
update
|
6 years ago |
|
yangkai
|
400a1cb38d
|
update
|
6 years ago |
|
yangkai
|
cc6d0ed83d
|
携程优惠券记录筛选
|
6 years ago |
|
yangkai
|
ad3f353e49
|
update:汇付支付邮件提醒
|
6 years ago |
|
hellolujian
|
ca0d44e9f3
|
[fix]新增组织state选项添加其他
|
6 years ago |
|
hellolujian
|
c7db75ebff
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
hellolujian
|
ca9fa4b2dd
|
[fix]新增组织state选项添加其他
|
6 years ago |
|
yangkai
|
af2ec66f48
|
update
|
6 years ago |
|
luoyang
|
4d3bd00ea4
|
fix hf qrcode
|
6 years ago |
|
kira
|
be79766deb
|
update
|
6 years ago |
|
luoyang
|
6bd68974e0
|
add Hf shortURL update
|
6 years ago |
|
yixian
|
615b9ddda0
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
7f730dfe75
|
修改触发模式
|
6 years ago |
|
luoyang
|
a4a16fbaba
|
add Hf shortURL update
|
6 years ago |
|
yangkai
|
bd5b1541af
|
测试账户权限调整
|
6 years ago |
|
luoyang
|
839033b7f7
|
add partner HF Qrocde
|
6 years ago |
|
luoyang
|
cda8c017ad
|
add HF Qrocde & change HF shortURL
|
6 years ago |
|
yangkai
|
3bfb19535f
|
Ctrip卡券记录查询修改
|
6 years ago |
|
kira
|
2a688ae378
|
update
|
6 years ago |
|
yangkai
|
a1a54931a3
|
Ctrip卡券记录接口优化
|
6 years ago |
|
yangkai
|
d251b38bcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
28eab9a41a
|
汇付支付完成邮件提醒
|
6 years ago |
|
luoyang
|
dd23545bae
|
fix hf_gateway.js add banklist && productlist
|
6 years ago |
|
yangkai
|
495bf22196
|
1.新增卡券记录接口
2.查询接口，查询条件(client_moniker) 、分页
|
6 years ago |
|
kira
|
dc103d5fd2
|
update
|
6 years ago |
|
luoyang
|
2b43ab4e2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
cbe23f9012
|
fix hf_gateway.js add #bankCard-li hide
|
6 years ago |
|
james.zhao
|
723f211a9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
b13a1fc4fe
|
update
|
6 years ago |
|
luoyang
|
54ab08e585
|
fix hf_gateway.js add #bankCard-li hide
|
6 years ago |
|
luoyang
|
e5578f539c
|
fix hf_gateway.js add #bankCard-li hide
|
6 years ago |
|
kira
|
7cd1310384
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
00270cdbd5
|
update
|
6 years ago |
|
james.zhao
|
8c8637a5dc
|
fix
|
6 years ago |
|
luoyang
|
2d7cc142c0
|
fix hf_gateway.js add #bankCard-li hide
|
6 years ago |
|
kira
|
cdba32148d
|
add customer payment info
|
6 years ago |
|
kira
|
076872abba
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
2683da65ca
|
wechat check add payment info
|
6 years ago |
|
taylor.dang
|
a2c55a6339
|
[Y] 订单支付状态检查
|
6 years ago |
|
kira
|
d1ccf17b1f
|
update
|
6 years ago |
|
kira
|
c1de98a283
|
tmp
|
6 years ago |
|
kira
|
9c71e15dad
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
5117274fab
|
hf pay page
|
6 years ago |
|
yixian
|
3bf47ef971
|
document fix
|
6 years ago |
|
luoyang
|
0a1327d926
|
add listen customerPaymentInfo
|
6 years ago |
|
yangkai
|
0c0f9f19df
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
f689953479
|
修改settle_hour bug
|
6 years ago |
|
luoyang
|
1812038645
|
fix clearing_detail
|
6 years ago |
|
luoyang
|
03274a4ee0
|
fix clearing_detail
|
6 years ago |
|
yangkai
|
6929b209fa
|
用户支付信息录入代码优化
|
6 years ago |
|
yangkai
|
90e17cc5b8
|
1.商品库改造
2.用户支付信息录入
|
6 years ago |
|
taylor.dang
|
0b666f80c2
|
fix bugs
|
6 years ago |
|
taylor.dang
|
155184dcf4
|
fix
|
6 years ago |
|
taylor.dang
|
d6f739cc63
|
fix
|
6 years ago |
|
taylor.dang
|
7796b95c2e
|
fix
|
6 years ago |
|
taylor.dang
|
8bcede71bc
|
fix
|
6 years ago |
|
luoyang
|
6acf488ce6
|
add hf clearingAmount select
|
6 years ago |
|
hellolujian
|
91a89dcc51
|
[fix]商户号管理页面优化
|
6 years ago |
|
james.zhao
|
0fe6d492f4
|
update
|
6 years ago |
|
james.zhao
|
0e21ee5ae3
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
7c7ae527c5
|
禁用商户开放查看
|
6 years ago |
|
kira
|
d22f211dc1
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
c0228420c9
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
3113068859
|
fixbug parent client invalid
|
6 years ago |
|
yangkai
|
944e89f3e9
|
文件上传超过规定大小，提示报错信息
|
6 years ago |
|
hellolujian
|
16d881bca1
|
[fix]商户号管理页面优化
|
6 years ago |
|
hellolujian
|
e26849f36b
|
[fix]商户号管理页面优化
|
6 years ago |
|
hellolujian
|
51402da218
|
[fix]商户号管理页面优化
|
6 years ago |
|
taylor.dang
|
1ee911e4c2
|
Settle Hour Config
|
6 years ago |
|
kira
|
790ca43758
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
23af0f0a27
|
update
|
6 years ago |
|
kira
|
8562993670
|
add log
|
6 years ago |
|
kira
|
a91fac2c21
|
update
|
6 years ago |
|
kira
|
3482de66c7
|
init client permission
|
6 years ago |
|
kira
|
2eeb320dc3
|
init client permission
|
6 years ago |
|
kira
|
1dd8dcd8f6
|
fixbug
|
6 years ago |
|
taylor.dang
|
1eafeb7a98
|
[Y] 自助申请商户分配NAP商户号
|
6 years ago |
|
kira
|
db42e22648
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d53c129f8d
|
update
|
6 years ago |
|
kira
|
bd1ac80352
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
1dd2179e25
|
update
|
6 years ago |
|
kira
|
995e292cfc
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java
|
6 years ago |
|
kira
|
f31fe586b8
|
update
|
6 years ago |
|
kira
|
23347b58cd
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
yangkai
|
ecd7c2a230
|
Risky Merchants优化
|
6 years ago |
|
kira
|
9ea1dabc33
|
Merge branch 'develop_partnerTA' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
# src/main/ui/static/config/organizations/organizations.js
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
|
kira
|
7da2f2ae24
|
update
|
6 years ago |
|
yixian
|
be0e8ff40d
|
aba file bug fix
|
6 years ago |
|
yixian
|
55eb47b8f7
|
fix clearing date display
|
6 years ago |
|
yixian
|
f0616d9323
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
d6589d2917
|
fix clearing date display
|
6 years ago |
|
taylor.dang
|
fb9d6da733
|
[Y] 通用商户号功能优化
|
6 years ago |
|
yixian
|
4523d77eee
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
c23689c578
|
settle date display
|
6 years ago |
|
yangkai
|
e2b56501ab
|
商户号管理功能优化
|
6 years ago |
|
taylor.dang
|
4a78ddac9a
|
新增微信不合规行业
|
6 years ago |
|
yangkai
|
5225ea537f
|
不合规关键字修改
|
6 years ago |
|
taylor.dang
|
0e58f61eb6
|
[Y] 新增微信不合规提醒 & dashboard 修复
|
6 years ago |
|
taylor.dang
|
e0a084b01e
|
fix hf css
|
6 years ago |
|
kira
|
c32c4f5832
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
6a4445df30
|
update
|
6 years ago |
|
kira
|
cdd589163e
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
43c020d4e3
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
6 years ago |
|
kira
|
43e849d879
|
update
|
6 years ago |
|
yixian
|
ff8b8e00e2
|
Merge branch 'hotfix_settlemail' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
6 years ago |
|
yangkai
|
9be4dfec85
|
Merge branch 'develop_test' into develop
|
6 years ago |
|
yangkai
|
39787b7416
|
1.非合规行业检查
2.dashboard今日数据显示异常
|
6 years ago |
|
yixian
|
bb4d16bdba
|
settlement mail content
|
6 years ago |
