eason.qian
|
121950e4a7
|
update app statement detail api
|
7 years ago |
yuan
|
91c8b1a398
|
add sql
|
7 years ago |
|
yuan
|
1ff7c46bc3
|
增加sub_merchant_id修改列表
|
7 years ago |
|
yuan
|
2e44dd4214
|
商户管理增加store_photo字段
|
7 years ago |
wangning
|
a74121cc62
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
7 years ago |
|
wangning
|
baec160c2d
|
Merge branch 'develop_postpone' into develop
|
7 years ago |
|
wangning
|
8c5b02fc92
|
client postpone
|
7 years ago |
|
yuan
|
f44036b04c
|
fix`
|
7 years ago |
|
yuan
|
8fc003f87e
|
fix`
|
7 years ago |
|
yuan
|
9a10445398
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
d6de760fe0
|
fix bug
|
7 years ago |
|
eason.qian
|
df189f70ba
|
fix
|
7 years ago |
|
yuan
|
6c33158e66
|
fix bug
|
7 years ago |
|
yuan
|
cedbbfe97e
|
fix~
|
7 years ago |
|
yuan
|
ddb1ebd101
|
Merge branch 'settlement' into develop
|
7 years ago |
|
yuan
|
005418d1eb
|
fix~
|
7 years ago |
|
wangning
|
3dfbfc9647
|
update
|
7 years ago |
|
wangning
|
0d7d2ade26
|
update
|
7 years ago |
|
yuan
|
010586e3fd
|
add~
|
7 years ago |
|
yuan
|
071c05905a
|
fix~
|
7 years ago |
|
yuan
|
ae8ea53870
|
商户管理增加suburb筛选
|
7 years ago |
|
wangning
|
997867d224
|
update
|
7 years ago |
|
wangning
|
48e5624cb2
|
merge conflict
|
7 years ago |
|
wangning
|
eacb8d89de
|
update
|
7 years ago |
|
eason.qian
|
3f4a2cf9a6
|
fix partner invoice + settlement log tip
|
7 years ago |
|
wangning
|
f4345b7096
|
update
|
7 years ago |
|
wangning
|
2936b1072e
|
order bind qrcode version
|
7 years ago |
|
wangning
|
c221156029
|
add qrcode log
|
7 years ago |
|
wangning
|
2f1abf902a
|
add mongo
|
7 years ago |
|
eason.qian
|
470f5d191e
|
fix add app invoice
|
7 years ago |
|
wangning
|
518b0639b4
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
fce674a87b
|
update
|
7 years ago |
|
wangning
|
f41096d2a1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
31ee2f686f
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
bf3d6db0d0
|
fix apidoc
|
7 years ago |
|
yuan
|
873ec92e6c
|
fix~
|
7 years ago |
|
yuan
|
e00d2bf155
|
fix ~
|
7 years ago |
yixian
|
40a0078132
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
e2455be41c
|
ABA File Modify
|
7 years ago |
|
wangning
|
6931dcd1de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e0417057b5
|
copy switch surcharge interface
|
7 years ago |
|
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项，fix bug
|
7 years ago |
|
yuan
|
ceafd8b858
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
7 years ago |
|
eason.qian
|
49a9a2a5c1
|
fix
|
7 years ago |
|
wangning
|
95e0d8c2cb
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
0bc5ec040e
|
update
|
7 years ago |
|
wangning
|
39185f20d9
|
update
|
7 years ago |
|
wangning
|
c39bee44e6
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
264ec82506
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
492a4f3f06
|
Merge branch 'bugfix' into develop
|
7 years ago |
|
wangning
|
2ba62a83f1
|
bug fix
|
7 years ago |
|
wangning
|
e7f2bfb302
|
add app client QRcode
|
7 years ago |
|
eason.qian
|
2707c2b195
|
fix
|
7 years ago |
|
wangning
|
9f428e2bd8
|
update
|
7 years ago |
|
eason.qian
|
8f7125dae6
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
c72612110d
|
fix html
|
7 years ago |
|
yuan
|
580ea4ee05
|
商户管理增加merchant_id筛选
|
7 years ago |
|
eason.qian
|
e2b3d6c686
|
fix 最后一步打回
|
7 years ago |
|
wangning
|
05d325db47
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
|
7 years ago |
|
wangning
|
3ce990059b
|
update
|
7 years ago |
|
wangning
|
318c661057
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
|
eason.qian
|
77738cf8a5
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
7f40f73ad6
|
fix
|
7 years ago |
|
wangning
|
4920ab324b
|
update
|
7 years ago |
|
wangning
|
ad08428964
|
update
|
7 years ago |
|
wangning
|
498b30c519
|
update
|
7 years ago |
|
eason.qian
|
2b928e930d
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
210408268e
|
fix
|
7 years ago |
|
wangning
|
391e254402
|
update
|
7 years ago |
|
wangning
|
24f49dfcfc
|
rollback
|
7 years ago |
|
eason.qian
|
243de321e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
ace0dcb970
|
fix
|
7 years ago |
|
wangning
|
e68fb40acf
|
update
|
7 years ago |
|
yuan
|
8d80e1ff97
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
a288696a61
|
fix~
|
7 years ago |
|
eason.qian
|
e3d138c490
|
fix
|
7 years ago |
|
eason.qian
|
62a258ccfb
|
fix
|
7 years ago |
|
wangning
|
13f8547d47
|
update
|
7 years ago |
|
eason.qian
|
467b840001
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
8e06058e43
|
fix
|
7 years ago |
Tayl0r
|
e3ff27b07b
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
|
Tayl0r
|
dea2d25dc4
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
|
wangning
|
e7817f5449
|
tmp
|
7 years ago |
|
yuan
|
da999e6c85
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
2b3343135d
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0f045d65fe
|
fix
|
7 years ago |
|
yuan
|
9af1015a1b
|
fix ~
|
7 years ago |
|
wangning
|
3a2b7356ca
|
tmp
|
7 years ago |
|
wangning
|
72e09ceb55
|
update
|
7 years ago |
|
wangning
|
9e97c10874
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
5b8bfad73d
|
bug fix
|
7 years ago |
|
wangning
|
6380c5d5b5
|
update
|
7 years ago |
|
eason.qian
|
6ada3a95f7
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
|
yuan
|
7abd5b8a6e
|
Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
|
7 years ago |
|
yuan
|
db31a54f52
|
fix bug
|
7 years ago |
|
wangning
|
b7ef26926e
|
Merge branch 'clientmodify' into develop_client_config
|
7 years ago |
|
wangning
|
a3ab6bc849
|
update
|
7 years ago |
|
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 |
