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 |
