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 |