yixian
|
b2dbbcbfce
|
client modify
|
7 years ago |
eason.qian
|
5793bca24c
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
eason.qian
|
719c28acef
|
fix
|
7 years ago |
eason.qian
|
9aa7f66bc3
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
yuan
|
be4fa9b32c
|
fix bug
|
7 years ago |
eason.qian
|
08f873e30a
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
wangning
|
11961dc264
|
tmp
|
7 years ago |
yuan
|
c7fcb2c867
|
fix~
|
7 years ago |
yixian
|
c9b7d470ba
|
update documents
|
7 years ago |
wangning
|
25e2467438
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
c0d3e4a787
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
d930511e61
|
update
|
7 years ago |
eason.qian
|
df0341f6f6
|
fix
|
7 years ago |
wangning
|
1067641ec3
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
fa4182eb61
|
update
|
7 years ago |
wangning
|
8c78a671cf
|
add test
|
7 years ago |
yuan
|
ce29c7f86f
|
fix bug
|
7 years ago |
yuan
|
e27769b945
|
fix bug
|
7 years ago |
yuan
|
51dc7988f2
|
fix bug
|
7 years ago |
yuan
|
6aaa589ad2
|
修改html
|
7 years ago |
yuan
|
0a1feb9671
|
修改html
|
7 years ago |
wangning
|
90b37f3bab
|
商户查询接口检查
|
7 years ago |
eason.qian
|
75dd9b3896
|
fix
|
7 years ago |
wangning
|
24f2c0bf95
|
调整查询商户信息接口
|
7 years ago |
wangning
|
246c6eddd5
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
wangning
|
2228a0cc45
|
bug fix
|
7 years ago |
wangning
|
53d001a965
|
update
|
7 years ago |
wangning
|
a1eb86e9ee
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
88308a3ee9
|
update
|
7 years ago |
wangning
|
5e15731509
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
c38d906cea
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
c687dc2ebe
|
update
|
7 years ago |
yuan
|
025d24c358
|
fix bug
|
7 years ago |
eason.qian
|
1854088159
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
24fab32043
|
fix total_surcharge add tax_amount
|
7 years ago |
eason.qian
|
dba05af35c
|
fix
|
7 years ago |
wangning
|
c0fc073271
|
tmp
|
7 years ago |
wangning
|
74e955bca4
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
0567dc9b0a
|
tmp
|
7 years ago |
wangning
|
a4049f49e9
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
ffa553ca06
|
update
|
7 years ago |
eason.qian
|
f4ff5aa2b2
|
fix
|
7 years ago |
wangning
|
2be8962d73
|
tmp
|
7 years ago |
yuan
|
3fff080c23
|
fix bug
|
7 years ago |
yuan
|
1c77a938e2
|
Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
|
7 years ago |
yuan
|
e28adf6a23
|
fix bug
|
7 years ago |
eason.qian
|
bfc1617fcf
|
fix
|
7 years ago |
eason.qian
|
cec7be1bfa
|
fix 商户导出transaction pdf report 去除royalpay fee及相关渠道手续费显示
|
7 years ago |
yuan
|
d367f9c615
|
fix bug
|
7 years ago |
yuan
|
33b3795a58
|
fix partner dashboard
|
7 years ago |
wangning
|
caa60f6287
|
Modify BD Leader prize
|
7 years ago |
yuan
|
fbae009d06
|
modify html
|
7 years ago |
wangning
|
0a41d58e77
|
update
|
7 years ago |
wangning
|
e746485938
|
update
|
7 years ago |
wangning
|
1655144454
|
Merge branch 'develop'
|
7 years ago |
wangning
|
9c6f6db4bf
|
update
|
7 years ago |
wangning
|
4a9ea66407
|
update doc
|
7 years ago |
yuan
|
1561c75e50
|
修改partner_dashboard.html
|
7 years ago |
wangning
|
4f780978dd
|
update
|
7 years ago |
wangning
|
9e788f0581
|
contract add query param
|
7 years ago |
yuan
|
0bef940daa
|
修改partner dashboard
|
7 years ago |
wangning
|
86681ed0ca
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
414c4a783d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
a0e2115033
|
fixbug
|
7 years ago |
yixian
|
c6b7a5d2d4
|
error processing
|
7 years ago |
eason.qian
|
921936404b
|
fix
|
7 years ago |
eason.qian
|
5015d7983b
|
fix
|
7 years ago |
wangning
|
d2ae70876f
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
c8856db17b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
a9b249e386
|
fixbug
|
7 years ago |
eason.qian
|
4fbb104b7e
|
fix
|
7 years ago |
eason.qian
|
b9efe148ec
|
fix
|
7 years ago |
eason.qian
|
cb13558735
|
fix
|
7 years ago |
eason.qian
|
57655cd643
|
fix
|
7 years ago |
eason.qian
|
7e404d685f
|
fix
|
7 years ago |
eason.qian
|
c04d6d93c4
|
fix
|
7 years ago |
eason.qian
|
b1bb48e5fe
|
fix
|
7 years ago |
eason.qian
|
e19804786b
|
Merge branch 'develop'
|
7 years ago |
eason.qian
|
c29235de78
|
fix
|
7 years ago |
eason.qian
|
86bc87c381
|
fix
|
7 years ago |
eason.qian
|
90c13fc328
|
fix
|
7 years ago |
wangning
|
7324b3a099
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
50eb0d8180
|
add contract analysis & pageable
|
7 years ago |
wangning
|
0d2712b647
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
9467e91794
|
update
|
7 years ago |
wangning
|
d634cdde53
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
e503e7dca1
|
update
|
7 years ago |
wangning
|
228f05a86e
|
Merge branch 'update' into develop
|
7 years ago |
wangning
|
40cdb31d7f
|
update
|
7 years ago |
wangning
|
04c76cf4df
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
258af077c9
|
1 update api doc
2 fixbug pos
|
7 years ago |
yixian
|
ccd94f8e8d
|
logback logger
|
7 years ago |
eason.qian
|
649422f6ef
|
fix
|
7 years ago |
eason.qian
|
f31b05ca74
|
fix
|
7 years ago |
eason.qian
|
c1302de12a
|
fix
|
7 years ago |
wangning
|
3c1c6e7219
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
41b993e995
|
update
|
7 years ago |
wangning
|
f86c8c0b98
|
update
|
7 years ago |
wangning
|
effe1d79f6
|
update
|
7 years ago |
wangning
|
3b53be6de3
|
update contract
|
7 years ago |
eason.qian
|
5052f5f7d6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
9cc683fa30
|
fix
|
7 years ago |
wangning
|
011bba9eb3
|
update
|
7 years ago |
wangning
|
45025d73f2
|
update
|
7 years ago |
wangning
|
ad2f84a2b6
|
update
|
7 years ago |
wangning
|
2d32485efe
|
update
|
7 years ago |
wangning
|
946b773031
|
update
|
7 years ago |
wangning
|
9bf6dd5a27
|
Merge branch 'master_doc' into develop
|
7 years ago |
wangning
|
c213feff59
|
remove sandbox
|
7 years ago |
wangning
|
899ca5001e
|
update
|
7 years ago |
wangning
|
7dc7748f7e
|
update contract
|
7 years ago |
wangning
|
68c896aae2
|
update contract Abnormal process
|
7 years ago |
wangning
|
ec627bb330
|
update
|
7 years ago |
wangning
|
0ec3552361
|
add microapp pay
|
7 years ago |
eason.qian
|
d09e38203f
|
fix
|
7 years ago |
eason.qian
|
481fa42eb5
|
fix
|
7 years ago |
eason.qian
|
a02ba16a8c
|
Merge branch 'master' into develop
|
7 years ago |
wangning
|
aa424f3a88
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
85b51943d4
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
376bf1ab1f
|
Merge branch 'hotfix' into develop
|
7 years ago |
wangning
|
71ea6f9325
|
app Version
|
7 years ago |
eason.qian
|
0aebf1bfc3
|
fix
|
7 years ago |
eason.qian
|
4b29f6097c
|
fix
|
7 years ago |
eason.qian
|
f8406c81ec
|
fix
|
7 years ago |
eason.qian
|
a3c15325c8
|
fix
|
7 years ago |
wangning
|
d4287e0bc0
|
update
|
7 years ago |
eason.qian
|
a510dff3c5
|
fix
|
7 years ago |
eason.qian
|
796589c8d6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
ece7015c13
|
fix
|
7 years ago |
wangning
|
ea8b3049dc
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
dc5651cdee
|
update
|
7 years ago |
eason.qian
|
e6e4ced9a0
|
fix
|
7 years ago |
eason.qian
|
c8ffdbdf73
|
fix
|
7 years ago |
wangning
|
45ae8c44ef
|
update
|
7 years ago |
wangning
|
2a7d2b065e
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
5f4a59ecde
|
hotfix
|
7 years ago |
eason.qian
|
6bf0c95e29
|
fix
|
7 years ago |
wangning
|
39f1cf3b4d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
c531ce911a
|
update
|
7 years ago |
yuan
|
3d7bddfc92
|
modify html
|
7 years ago |
yuan
|
75bdedc6f9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
df901c8745
|
fix bug
|
7 years ago |
wangning
|
abf23053d7
|
fixbug
|
7 years ago |
yixian
|
be462ec53d
|
Merge branch 'hotfix20180322manualsettle' into develop
|
7 years ago |
yixian
|
c846ce2451
|
Merge branch 'hotfix20180322manualsettle'
|
7 years ago |
yixian
|
5db4a09b92
|
manual settle
|
7 years ago |
wangning
|
0997bf3cb0
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
26e7eee4af
|
update aggregate QR board template
|
7 years ago |
eason.qian
|
f0ade8c924
|
fix
|
7 years ago |
eason.qian
|
8ccbbe6e61
|
fix
|
7 years ago |
yuan
|
8f363f5c07
|
增加查看mondelay活动记录表
|
7 years ago |
wangning
|
332a2e6884
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
eason.qian
|
df4c8f90d0
|
fix
|
7 years ago |
wangning
|
f26f218a18
|
Merge branch 'notice' into develop
|
7 years ago |
wangning
|
69708125bf
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
0ec7bc27c0
|
update
|
7 years ago |
eason.qian
|
187298aad8
|
fix
|
7 years ago |
wangning
|
1d0100a4c9
|
update
|
7 years ago |
wangning
|
d84064a62b
|
fixbug tax_amount
|
7 years ago |
wangning
|
a40c046e41
|
fixbug
|
7 years ago |
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
e4018d4939
|
update manual settle
|
7 years ago |
yixian
|
8a161c904f
|
Merge branch 'hotfix20180322manualsettle' into develop
|
7 years ago |
yixian
|
3388f19b31
|
manual settle
|
7 years ago |
yuan
|
7850e9e36c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
ed6aa9c00c
|
fix bug
|
7 years ago |
wangning
|
ce1da924fd
|
update
|
7 years ago |
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
wangning
|
ba5174fda7
|
update
|
7 years ago |
wangning
|
24510cf6e6
|
tmp
|
7 years ago |
eason.qian
|
1efd1b604a
|
fix
|
7 years ago |
yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
7 years ago |
yuan
|
3545b72406
|
add cancle_waring msg
|
7 years ago |
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
eason.qian
|
92646432d5
|
fix
|
7 years ago |
yixian
|
0e826d98d2
|
rule update
|
7 years ago |
yixian
|
211da4f69e
|
rule update
|
7 years ago |
yixian
|
d47830f7f9
|
find settle to
|
7 years ago |
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
eason.qian
|
777a8c314e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
eason.qian
|
34605db062
|
fix
|
7 years ago |
wangning
|
55c7a93439
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
beefaeccc0
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
7afbb7479f
|
fixbug
|
7 years ago |
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
2287468292
|
fix
|
7 years ago |
wangning
|
e5a6813c91
|
update
|
7 years ago |
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
daee2f1a2e
|
update QR board
|
7 years ago |
yuan
|
3714c814c3
|
modify html
|
7 years ago |
wangning
|
cd60d89c40
|
unread interface add column msg_interval
|
7 years ago |
wangning
|
30d1c708f8
|
Partner Settlements Logs
|
7 years ago |
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
7e35483150
|
update
|
7 years ago |
eason.qian
|
d5097ff363
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
0667724269
|
mu
|
7 years ago |
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
yuan
|
8f14cb47a2
|
update
|
7 years ago |
yixian
|
c011802240
|
scale
|
7 years ago |
yixian
|
ba6e50ab5c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
yixian
|
041746ef4e
|
scale
|
7 years ago |
eason.qian
|
3cbdaf0339
|
fix cache bug~
|
7 years ago |
wangning
|
558c9fd771
|
update
|
7 years ago |
wangning
|
a5608059ea
|
update
|
7 years ago |
wangning
|
0fea884bd1
|
update
|
7 years ago |
wangning
|
d41232822f
|
update
|
7 years ago |
wangning
|
f6d92dde3a
|
update
|
7 years ago |
wangning
|
9bd674275f
|
update
|
7 years ago |
wangning
|
f14dbf84ae
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
eason.qian
|
91bba5dea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
10bb3b1404
|
fix
|
7 years ago |
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
wangning
|
69104c110c
|
update
|
7 years ago |
wangning
|
674235960d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
bf8b17a5dc
|
Merge branch 'master_rate_cache' into develop
|
7 years ago |
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
eason.qian
|
373f024a57
|
fix
|
7 years ago |
eason.qian
|
d3d4b633fb
|
fix
|
7 years ago |
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
yixian
|
3f513ead4e
|
Merge branch 'manualsettle' into develop
|
7 years ago |
yixian
|
f11ccbc7cd
|
details
|
7 years ago |
wangning
|
a2b36ec297
|
update
|
7 years ago |
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
yixian
|
69ecf574bd
|
Merge branch 'manualsettle' into develop
|
7 years ago |
yixian
|
4c6fbed61c
|
client
|
7 years ago |
yixian
|
241586966d
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yixian
|
de40d0d0ea
|
manual settle request
|
7 years ago |
eason.qian
|
f1049e7cd9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
18db21c9f6
|
fix
|
7 years ago |
wangning
|
0a87728a96
|
update
|
7 years ago |
yuan
|
41bdbdfe3c
|
fix bug
|
7 years ago |
wangning
|
4d2a27c2ca
|
update
|
7 years ago |
wangning
|
caadaa605d
|
update
|
7 years ago |
wangning
|
1b462fd599
|
update
|
7 years ago |
wangning
|
9981c2b36f
|
add acts log
|
7 years ago |
wangning
|
b6daea5821
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
yuan
|
c6ba497390
|
活动管理增加字段
|
7 years ago |
wangning
|
fbec5fbd56
|
update
|
7 years ago |
Tayl0r
|
dd90c988fb
|
[Y] 翼支付清算日期
|
7 years ago |
eason.qian
|
2c313cbf65
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
4a78305160
|
fix
|
7 years ago |
wangning
|
176b69d685
|
update
|
7 years ago |
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
7 years ago |
yuan
|
bc82d0f6b7
|
fix html
|
7 years ago |
yuan
|
432067e046
|
fix~
|
7 years ago |
yuan
|
92be3cf81a
|
fix html
|
7 years ago |
wangning
|
7ea1050366
|
update
|
7 years ago |
wangning
|
7171a225d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |