yuan
|
455eedbcd5
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
5b7349dbb8
|
fix~~
|
7 years ago |
wangning
|
843dbce89f
|
update
|
7 years ago |
|
wangning
|
71d25d675d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
037c8adfa3
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
a99828d095
|
update
|
7 years ago |
|
yuan
|
49ad834a79
|
fix~~
|
7 years ago |
eason.qian
|
46302d675a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
39e0d81d8a
|
fix
|
7 years ago |
|
yuan
|
d8bf233bd3
|
fix~~
|
7 years ago |
|
eason.qian
|
4f28d86abd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
4cb89bf3ab
|
fix
|
7 years ago |
|
wangning
|
535e43dcb8
|
update
|
7 years ago |
|
eason.qian
|
82353cfe20
|
fix
|
7 years ago |
|
yuan
|
518228fc38
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
7f69e34750
|
fix~~
|
7 years ago |
|
wangning
|
2b43a58632
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
a9bb6143b5
|
update
|
7 years ago |
|
yuan
|
7c4529e382
|
fix~~
|
7 years ago |
|
yuan
|
dd228d86c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
ba0b61b701
|
fix~~
|
7 years ago |
|
wangning
|
8359b31873
|
update
|
7 years ago |
|
wangning
|
a49313d0b7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
91e340f3c8
|
update
|
7 years ago |
|
wangning
|
99df2c0e9f
|
update
|
7 years ago |
|
yuan
|
1d5fd9f31e
|
fix~~
|
7 years ago |
|
yuan
|
8b8d2adb15
|
fix~~
|
7 years ago |
|
yuan
|
e28a3f1f9f
|
add ~
|
7 years ago |
|
yuan
|
30210a2c44
|
fix~
|
7 years ago |
|
wangning
|
a9c50800b0
|
add file interface
|
7 years ago |
|
yuan
|
e0bde1934d
|
add~
|
7 years ago |
|
yuan
|
c76c1f3a63
|
fix~
|
7 years ago |
|
yuan
|
7c8188466c
|
fix~
|
7 years ago |
|
yuan
|
198953cbad
|
Merge branch 'clientApply' into develop
|
7 years ago |
|
yuan
|
c287b2ec13
|
fix~
|
7 years ago |
|
wangning
|
fe8f851731
|
update
|
7 years ago |
|
wangning
|
b028a0deb1
|
update
|
7 years ago |
|
wangning
|
a84406f6c0
|
update
|
7 years ago |
|
yuan
|
18e9865b77
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
# src/main/ui/merchant_application.html
|
7 years ago |
|
wangning
|
9059101594
|
update
|
7 years ago |
|
wangning
|
e9573f77f7
|
update
|
7 years ago |
|
wangning
|
02903d5055
|
Merge branch 'clientApply' into develop
# Conflicts:
# src/main/ui/merchant_application.html
# src/main/ui/static/css/merchant_application.css
# src/main/ui/static/merchantapplication/merchant_application.js
|
7 years ago |
|
wangning
|
55e7c465b3
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
d03ea655a4
|
update
|
7 years ago |
|
wangning
|
0b70be1e4e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
87a4dd4ac6
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
c327748b61
|
update
|
7 years ago |
|
yuan
|
483b3aa9c1
|
fix~
|
7 years ago |
|
wangning
|
943da647cb
|
update
|
7 years ago |
|
wangning
|
4bab6f1223
|
update
|
7 years ago |
|
wangning
|
e5ee89eb15
|
update
|
7 years ago |
|
wangning
|
b5f2f1ed29
|
update
|
7 years ago |
|
wangning
|
d9a6af58bb
|
update
|
7 years ago |
|
yuan
|
2ba51365ec
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
yuan
|
8131486839
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
wangning
|
3429300924
|
update
|
7 years ago |
|
wangning
|
51aa069acd
|
update
|
7 years ago |
|
wangning
|
73d07ba731
|
SettleMent Estimate alipayOnline
|
7 years ago |
|
wangning
|
2d8f06c845
|
update
|
7 years ago |
|
yuan
|
08f2736c8e
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
89016d48f8
|
add getaway 13
|
7 years ago |
|
yuan
|
299f69957a
|
fix~
|
7 years ago |
|
yuan
|
f4da89ddcd
|
fix~
|
7 years ago |
|
wangning
|
24f3e1f356
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
7 years ago |
|
wangning
|
be7727061d
|
update
|
7 years ago |
|
wangning
|
d51a174b7e
|
update
|
7 years ago |
|
wangning
|
f502ac2f80
|
update
|
7 years ago |
|
eason.qian
|
9944407894
|
自助开通合规流程改造
|
7 years ago |
|
yuan
|
c7a80a9b26
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
yuan
|
74a59a1bd3
|
fix~
|
7 years ago |
|
wangning
|
c56773120d
|
update
|
7 years ago |
|
wangning
|
06a4804543
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
7 years ago |
|
wangning
|
df1e735eff
|
update
|
7 years ago |
|
yuan
|
19f0045183
|
fix~
|
7 years ago |
|
wangning
|
b4f76e8182
|
update
|
7 years ago |
|
wangning
|
6b83b79512
|
update
|
7 years ago |
|
wangning
|
914525f150
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/ui/merchant_application.html
|
7 years ago |
|
wangning
|
c6d83b1c5a
|
update
|
7 years ago |
|
wangning
|
ce27310c40
|
update
|
7 years ago |
|
yuan
|
1ff35dc8d1
|
fix~
|
7 years ago |
|
yuan
|
7c8c0c56c9
|
fix~
|
7 years ago |
|
wangning
|
41376c740f
|
update
|
7 years ago |
|
wangning
|
2d829fb746
|
update name
|
7 years ago |
|
wangning
|
0108ab9322
|
update
|
7 years ago |
|
wangning
|
1e97502b4b
|
update
|
7 years ago |
|
wangning
|
2b414c537d
|
update
|
7 years ago |
|
wangning
|
f6be2111f2
|
merge conflict
|
7 years ago |
|
wangning
|
5980813f58
|
update
|
7 years ago |
|
wangning
|
25f11e7c3c
|
update
|
7 years ago |
|
wangning
|
ed6d43b18a
|
add mail status
|
7 years ago |
|
yuan
|
2337e30251
|
fix~
|
7 years ago |
|
wangning
|
047ba2b7d7
|
update url
|
7 years ago |
|
yuan
|
0c393ef0bc
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
yuan
|
00655632b4
|
fix~
|
7 years ago |
|
wangning
|
c4f2de599e
|
update
|
7 years ago |
|
wangning
|
3bbf73298d
|
merge conflict
|
7 years ago |
|
wangning
|
45c8e9248c
|
update
|
7 years ago |
|
yuan
|
54f7f8ee9c
|
fix~
|
7 years ago |
|
yuan
|
9889521acd
|
fix~
|
7 years ago |
|
wangning
|
89d0c7a4ae
|
rollback
|
7 years ago |
|
wangning
|
3f03b2aa18
|
tmp
|
7 years ago |
|
wangning
|
e9be935d2a
|
update
|
7 years ago |
|
wangning
|
9da06355cb
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
0cbd63031f
|
update
|
7 years ago |
|
wangning
|
82562fb045
|
tmp
|
7 years ago |
|
wangning
|
fd74bf0e22
|
update
|
7 years ago |
|
yuan
|
5984216f64
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
eason.qian
|
2733a1ea76
|
fix
|
7 years ago |
|
wangning
|
15fe2c59fb
|
add verify mail & SMS code
|
7 years ago |
|
yuan
|
9d05f01072
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
7 years ago |
|
wangning
|
1842e10bb3
|
tmp
|
7 years ago |
|
wangning
|
543964051b
|
tmp
|
7 years ago |
|
wangning
|
48cc6509c0
|
tmp
|
7 years ago |
|
wangning
|
025c3525f2
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
67062c1930
|
add risk record authority
|
7 years ago |
|
wangning
|
09976bbab9
|
tmp
|
7 years ago |
|
yuan
|
3569ec32e9
|
Merge branch 'merchant_application' into clientApply
|
7 years ago |
|
yuan
|
de98a7c279
|
add
|
7 years ago |
|
wangning
|
687c8b10e7
|
Merge branch 'test' into develop
# Conflicts:
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
7 years ago |
|
wangning
|
c81e91d1b2
|
update
|
7 years ago |
|
eason.qian
|
0851f793a0
|
Merge branch 'develop' into clientApply
|
7 years ago |
|
wangning
|
11cf6b5819
|
update
|
7 years ago |
|
wangning
|
55375af2ed
|
fix
|
7 years ago |
|
wangning
|
4dd95c3cf5
|
fix
|
7 years ago |
|
wangning
|
57b3a77fbd
|
update
|
7 years ago |
|
wangning
|
f24084254c
|
add log
|
7 years ago |
|
wangning
|
32a317c344
|
update
|
7 years ago |
|
eason.qian
|
b801aba02d
|
mailgun
|
7 years ago |
|
eason.qian
|
23258a78bb
|
Merge branch 'mailgun' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
7 years ago |
|
eason.qian
|
a4fb42ef4b
|
fix
|
7 years ago |
|
wangning
|
25d54b340b
|
Merge branch 'mailGunTest' into test
# Conflicts:
# src/main/resources/application-local.properties
# src/main/resources/application.properties
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
7 years ago |
|
wangning
|
6ab808a45f
|
update
|
7 years ago |
|
wangning
|
128eddeb28
|
update
|
7 years ago |
|
wangning
|
c2d64ca19a
|
qrcode
|
7 years ago |
|
wangning
|
da05f901ca
|
qrcode
|
7 years ago |
Tayl0r
|
807166f6fc
|
log
|
7 years ago |
|
wangning
|
5661406e27
|
update
|
7 years ago |
|
wangning
|
2e01748e11
|
add maven test
|
7 years ago |
|
wangning
|
63a22cd783
|
update
|
7 years ago |
|
wangning
|
8f38a3f2c4
|
fix customer_order statics
|
7 years ago |
|
eason.qian
|
83f2de9c93
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
85bf0c378d
|
fix
|
7 years ago |
|
wangning
|
b569b5fc5d
|
update
|
7 years ago |
|
wangning
|
ad6243d386
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
b0050d60f1
|
merge conflict
|
7 years ago |
|
wangning
|
9540f99d86
|
modify task method name
|
7 years ago |
|
Tayl0r
|
126b6b59bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
2dfb1a052a
|
[Y] 签名增加验证节点ip
|
7 years ago |
|
yuan
|
4c3360f9e5
|
fix html
|
7 years ago |
|
wangning
|
58b12d66b3
|
modify mail gun properties
|
7 years ago |
|
wangning
|
11e7bd5e13
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
54ae201cde
|
modify redpack send rule
|
7 years ago |
|
yuan
|
963c7951de
|
修改红包返现页面
|
7 years ago |
|
wangning
|
f7774cf14f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
9acc33a509
|
fixbug daily_transactions
|
7 years ago |
yixian
|
e386d9cfe8
|
Merge branch 'hotfix20180517compileerr' into develop
|
7 years ago |
|
yixian
|
d95e848045
|
compile error
|
7 years ago |
|
yixian
|
3034bf99fd
|
task edit for docker
|
7 years ago |
|
wangning
|
b55f8e3f9d
|
update
|
7 years ago |
|
wangning
|
601e678e09
|
update
|
7 years ago |
|
wangning
|
9a51b08d41
|
change microapp to MiniProgram
|
7 years ago |
|
wangning
|
7c0da6d5cf
|
update
|
7 years ago |
|
wangning
|
44087dd5d1
|
update
|
7 years ago |
|
wangning
|
2b2b5563d4
|
update
|
7 years ago |
|
yuan
|
68339f4027
|
订单查询增加gateway选项
|
7 years ago |
|
wangning
|
f32e2205fb
|
update
|
7 years ago |
|
yuan
|
139711f662
|
fix html
|
7 years ago |
|
wangning
|
b34e6b8f3c
|
update
|
7 years ago |
|
yuan
|
8f88d8084b
|
fix bug
|
7 years ago |
|
wangning
|
9126519dcf
|
merge
|
7 years ago |
|
wangning
|
adbfe6ca31
|
Merge branch 'mailgun' of https://git.royalpay.com.au/git/royalv2.manage into mailgun
|
7 years ago |
|
yuan
|
cfa1f5f6e0
|
add~
|
7 years ago |
|
wangning
|
74b685beb8
|
update
|
7 years ago |
|
wangning
|
1363061693
|
update
|
7 years ago |
|
wangning
|
a46cfe5444
|
modify mail send
|
7 years ago |
|
wangning
|
7e21301e7d
|
update
|
7 years ago |
|
wangning
|
f9f58012e4
|
add mailgun interface
|
7 years ago |
|
eason.qian
|
99487530a3
|
fix
|
7 years ago |
|
wangning
|
9a1844fa13
|
update
|
7 years ago |
|
wangning
|
e5ef17bd7e
|
update
|
7 years ago |
|
wangning
|
8512a9d0a9
|
add mailgun notify
|
7 years ago |
|
wangning
|
f7f5a925dc
|
tmp
|
7 years ago |
|
wangning
|
dc1f20c838
|
add mail test
|
7 years ago |
|
wangning
|
ec0ead8d68
|
update
|
7 years ago |
|
wangning
|
85b0f7d653
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1d666071ff
|
add bill page
|
7 years ago |
|
yuan
|
0ce6b156dd
|
fix html~~~
|
7 years ago |
|
yuan
|
77621c6418
|
fix~
|
7 years ago |
|
wangning
|
536ea593b0
|
Merge branch 'hotfix_2' into develop
|
7 years ago |
|
wangning
|
194b5d60a2
|
fix bug
|
7 years ago |
|
wangning
|
6fc0474464
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
e63f08ba19
|
fix bug
|
7 years ago |
|
wangning
|
9cf07ff142
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
a5f97c0fa0
|
roll back
|
7 years ago |
|
wangning
|
0bdb01445b
|
roll back
|
7 years ago |
|
wangning
|
42a103901a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
14854979f8
|
close Estimate future interface
|
7 years ago |
|
wangning
|
ddee63590f
|
alsjd
|
7 years ago |
|
yuan
|
bce5a86aa4
|
fix bug~
|
7 years ago |
|
eason.qian
|
7f5dd867c3
|
fix
|
7 years ago |
|
yuan
|
c0fffb94e3
|
fix html
|
7 years ago |
|
yuan
|
2f2d21f03e
|
fix~
|
7 years ago |
|
yuan
|
f3f6af80f6
|
商户端增商户订单ID生成二维码功能
|
7 years ago |
|
wangning
|
f592cb4a7a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
665021e05d
|
bug fix
|
7 years ago |
|
yuan
|
631f705000
|
dashboard交易额增加缓存
|
7 years ago |
|
yuan
|
015e1e388d
|
风控记录增加筛选
|
7 years ago |
|
eason.qian
|
c0bd0d4d6c
|
fix
|
7 years ago |
|
wangning
|
0fe89dbde2
|
refuse apply
|
7 years ago |
|
wangning
|
59c1dfac8b
|
update customer impression work time
|
7 years ago |
|
wangning
|
8f6f81d00a
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
579a1cc472
|
fixbug
|
7 years ago |
|
eason.qian
|
172cea098b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
4d412afb9f
|
Merge branch 'hotfix'
|
7 years ago |
|
eason.qian
|
38261ec614
|
fix
|
7 years ago |
|
wangning
|
17aaa8e2db
|
update
|
7 years ago |
|
wangning
|
4f4f1bd1a1
|
update
|
7 years ago |
|
wangning
|
2bc908c7d9
|
update
|
7 years ago |
|
wangning
|
41723ba17e
|
update
|
7 years ago |
|
wangning
|
c2200d1f62
|
bd_id
|
7 years ago |
|
wangning
|
9ac5efbcc1
|
update
|
7 years ago |
|
wangning
|
8bbba61d9d
|
update
|
7 years ago |
|
wangning
|
87e1d6eb18
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
48e76b7d33
|
update
|
7 years ago |
|
eason.qian
|
591549acb6
|
fix
|
7 years ago |
|
wangning
|
d05cea8b1c
|
update mongo pwd
|
7 years ago |
|
wangning
|
8ac04b8d80
|
update
|
7 years ago |
|
wangning
|
992a696e25
|
update
|
7 years ago |
|
wangning
|
6616a10add
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
cdd9f0b700
|
update mongo db name
|
7 years ago |
|
wangning
|
83800853f3
|
update
|
7 years ago |
|
wangning
|
96d18a6171
|
update
|
7 years ago |
|
wangning
|
3f4b456e87
|
update
|
7 years ago |
|
wangning
|
fdbf906996
|
update
|
7 years ago |
|
wangning
|
4c5ffc129f
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
|
yuan
|
ae8d4a66ba
|
fix html~
|
7 years ago |
|
wangning
|
fe26434e11
|
update
|
7 years ago |
|
wangning
|
ba8ec57049
|
update
|
7 years ago |
|
wangning
|
ca23d42860
|
merge conflicts
|
7 years ago |
|
eason.qian
|
9b1f6fa399
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
969e3ac2ee
|
fix
|
7 years ago |
|
wangning
|
37902465f6
|
merge conflict
|
7 years ago |
|
eason.qian
|
46fe387a69
|
fix
|
7 years ago |
|
wangning
|
f1ea0af02f
|
update
|
7 years ago |
|
wangning
|
521137d2ea
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
dc4c955395
|
fix bug
|
7 years ago |
|
eason.qian
|
b7b1d49454
|
fix
|
7 years ago |
|
wangning
|
4efcb964b5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
35f66bf11a
|
Merge branch 'develop_risk' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
393b2cea90
|
update
|
7 years ago |
|
yixian
|
00a351a71c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
e11fa1efd5
|
rpay channel edit
|
7 years ago |
|
yuan
|
ee3e71e5c5
|
fix html~
|
7 years ago |
|
yuan
|
f4d5bdabaf
|
fix html~
|
7 years ago |
|
yuan
|
22c6e0aa5a
|
fix html~
|
7 years ago |
|
yixian
|
bca940a8c5
|
document update, php demo update
|
7 years ago |
|
eason.qian
|
ff80fbe56d
|
fix
|
7 years ago |
|
wangning
|
f4ee21ae6a
|
update
|
7 years ago |
|
wangning
|
b71cfdaa5c
|
update
|
7 years ago |
|
wangning
|
942acf08ba
|
update
|
7 years ago |
|
wangning
|
47df91b1c5
|
add manage web
|
7 years ago |
|
yuan
|
76d9b65b73
|
fix html
|
7 years ago |
|
yuan
|
6866c263ed
|
增加common_sub_merchant_id switch
|
7 years ago |
|
wangning
|
33db182dfb
|
tmp
|
7 years ago |
|
yuan
|
858494290f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
159a565889
|
fix html
|
7 years ago |
|
eason.qian
|
4291fd4ec3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
07f2474892
|
fix
|
7 years ago |
|
yuan
|
4b8ba85930
|
fix html
|
7 years ago |
|
yuan
|
3c79262ccd
|
fix html
|
7 years ago |
|
eason.qian
|
ae88cf1a10
|
fix
|
7 years ago |
|
eason.qian
|
bacde16fea
|
fix
|
7 years ago |
|
eason.qian
|
49ac845d23
|
fix
|
7 years ago |
|
wangning
|
51fdf932c1
|
tmp
|
7 years ago |
|
wangning
|
5e4e794d6d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1dfb71ab45
|
Merge branch 'fixbug' into develop
|
7 years ago |
|
wangning
|
a0c6ff984d
|
fixbug
|
7 years ago |
|
wangning
|
78688d7330
|
tmp
|
7 years ago |
|
yuan
|
8bb741bc71
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
da91e3cbb1
|
fix html
|
7 years ago |
|
wangning
|
eec7730e29
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
b6e9cf2d55
|
Merge branch 'fixbug' into develop
|
7 years ago |
|
wangning
|
bf8f4750ea
|
fix
|
7 years ago |
|
wangning
|
97220886c5
|
tmp
|
7 years ago |
|
yuan
|
b87ea5e727
|
fix html
|
7 years ago |
|
wangning
|
215949e30a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c72c0936d8
|
add doc
|
7 years ago |
|
wangning
|
c82400165e
|
tmp
|
7 years ago |
|
yuan
|
84c08eae1b
|
fix html
|
7 years ago |
|
yuan
|
fc65cfea0e
|
fix~
|
7 years ago |
|
eason.qian
|
86e1b7b03c
|
fix
|
7 years ago |
|
wangning
|
9b6b36685a
|
add risk interface
|
7 years ago |
|
eason.qian
|
f1c2894897
|
fix
|
7 years ago |
|
yuan
|
6fae98440a
|
fix~
|
7 years ago |
|
yuan
|
3bc97503af
|
fix~
|
7 years ago |
|
yuan
|
a5a68fff2f
|
fix~
|
7 years ago |
|
yuan
|
03477c83f0
|
fix~
|
7 years ago |
|
yuan
|
417ce0a261
|
增加商户号管理页面
|
7 years ago |
|
eason.qian
|
227b712f8f
|
fix
|
7 years ago |
|
eason.qian
|
5f9b173fe6
|
add ip location
|
7 years ago |
|
wangning
|
e3c7927bab
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
b239a9a02e
|
fix bug
|
7 years ago |
|
eason.qian
|
4e3e87b460
|
fix
|
7 years ago |
|
wangning
|
ff05fadea3
|
update
|
7 years ago |
|
wangning
|
edf02f8c23
|
update
|
7 years ago |
|
wangning
|
d188406122
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
f8b4cac8d2
|
update
|
7 years ago |
|
wangning
|
d37037f2ea
|
update
|
7 years ago |
|
wangning
|
88021a718c
|
add common sub_merchant_id
|
7 years ago |
|
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 |
|
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 |
|
wangning
|
e319db47ef
|
unread add act info
|
7 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
|
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
808e0b0be5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
febc6bc5b1
|
adjust merchant QR code
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
yuan
|
19ebddcfe2
|
fix bug
|
7 years ago |
|
Tayl0r
|
a82412eae7
|
Revert "[Y] 暂时关闭活动"
This reverts commit 021386f
|
7 years ago |
|
Tayl0r
|
021386fd5c
|
[Y] 暂时关闭活动
|
7 years ago |
|
yixian
|
28933de278
|
代码优化
|
7 years ago |
|
eason.qian
|
1c3ace6ffd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
yuan
|
6dbad697c4
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
wangning
|
43ed9074c1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1f112c19f7
|
fixbug
|
7 years ago |
|
eason.qian
|
6125d8b0f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
wangning
|
9bc84b33a8
|
fixbug
|
7 years ago |
|
yuan
|
9ffb7c4bd1
|
显示规则
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
7 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
yuan
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
b7459efc5b
|
fix
|
7 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
eason.qian
|
a887493153
|
fix
|
7 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
wangning
|
6c201c3e18
|
rollbakc conrtract
|
7 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
wangning
|
e99dbd910a
|
update
|
7 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
7 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
7 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
|
yuan
|
2bc68b8456
|
fix~
|
7 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
33a0a78bba
|
fix
|
7 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
7 years ago |
|
wangning
|
5be8e21b81
|
update
|
7 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
7 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
7 years ago |
|
eason.qian
|
6df34df759
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
c4324f1407
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
e234e5745f
|
fix 关闭合同提醒
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
950459e621
|
fix
|
7 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
7 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cc94c56c5b
|
update
|
7 years ago |
|
wangning
|
92d2273f16
|
update
|
7 years ago |
|
yixian
|
39faf54c55
|
document update
|
7 years ago |
|
yixian
|
34d5e0121c
|
folder name update
|
7 years ago |
|
wangning
|
ab995db58f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5779c9c1d6
|
Merge branch 'mail' into develop
|
7 years ago |
|
wangning
|
2e4bf7f332
|
init mail add short_name
|
7 years ago |
|
yixian
|
7d7ef6f2e6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
aa70140535
|
nap
|
7 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
7 years ago |
|
eason.qian
|
7f4f195fee
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
7 years ago |
|
wangning
|
8d08151728
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
98843f0513
|
fixbug download contract
|
7 years ago |
|
wangning
|
5589d83f0d
|
add exchange rate cache
|
7 years ago |
|
yuan
|
9992cc0294
|
fix~
|
7 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
|
wangning
|
3358eb269c
|
update
|
7 years ago |
|
wangning
|
8943d91097
|
fixbug contract greenchannel
|
7 years ago |
|
wangning
|
1fe41d5421
|
update
|
7 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
7 years ago |
|
yuan
|
df99ae3218
|
add title
|
7 years ago |
|
wangning
|
198b60e0d9
|
Merge branch 'develop_device_offline' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
|
wangning
|
3321310500
|
update
|
7 years ago |
|
wangning
|
7c760fe803
|
update
|
7 years ago |
|
wangning
|
e023b105e9
|
update
|
7 years ago |
|
wangning
|
3b056b4092
|
update
|
7 years ago |
|
wangning
|
bcaa7a85ff
|
update
|
7 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
|
eason.qian
|
bce1995633
|
fix
|
7 years ago |
|
wangning
|
ab94d60512
|
update
|
7 years ago |
|
wangning
|
7ab8a06feb
|
updateupdate
|
7 years ago |
|
wangning
|
81fb75377f
|
update
|
7 years ago |
|
wangning
|
b10606486b
|
update sql
|
7 years ago |
|
wangning
|
c2b9fc6424
|
update
|
7 years ago |
|
wangning
|
f79085be54
|
update
|
7 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
7 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
7 years ago |
|
wangning
|
55bad532b4
|
sign channel
|
7 years ago |
|
wangning
|
ff32f2cad2
|
update
|
7 years ago |
|
wangning
|
900f31a2c6
|
update
|
7 years ago |
|
wangning
|
8f5e2db5a5
|
update
|
7 years ago |
|
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
|
wangning
|
e7785b4699
|
update
|
7 years ago |
|
wangning
|
3f604e71ac
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
eason.qian
|
d35b6af86d
|
Merge remote-tracking branch 'origin/agreement' into agreement
|
7 years ago |
|
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
|
wangning
|
65975c4f6e
|
update
|
7 years ago |
|
wangning
|
15fd0edfc5
|
update
|
7 years ago |
|
Tayl0r
|
be9380de3d
|
[Y] 合同测试生成
|
7 years ago |
|
wangning
|
7de1eed456
|
update
|
7 years ago |
|
wangning
|
759c752455
|
update
|
7 years ago |
|
wangning
|
1e380cc65a
|
update
|
7 years ago |
|
wangning
|
81ecb15c05
|
update
|
7 years ago |
|
wangning
|
7ee91fb885
|
update
|
7 years ago |
|
wangning
|
1731d9e973
|
update
|
7 years ago |
|
yuan
|
2e3ab4a7f0
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
|
eason.qian
|
0be0167cc2
|
new act
|
7 years ago |
|
wangning
|
8127076865
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
yuan
|
f278517d63
|
add html
|
7 years ago |
|
wangning
|
fef08a3f58
|
update
|
7 years ago |
|
eason.qian
|
585401834b
|
new act
|
7 years ago |
|
wangning
|
1019f2ef9f
|
Merge branch 'develop_contract' into agreement
|
7 years ago |
|
wangning
|
863b7794e3
|
update
|
7 years ago |
|
yixian
|
b1bebb8d0f
|
web error
|
7 years ago |
|
yixian
|
d778ad622c
|
web error
|
7 years ago |
|
wangning
|
5db7294880
|
update
|
7 years ago |
|
eason.qian
|
93b4ac57b2
|
new act
|
7 years ago |
|
wangning
|
29d7835400
|
update
|
7 years ago |
|
eason.qian
|
92a9fb7482
|
new act
|
7 years ago |
|
wangning
|
206106caac
|
update
|
7 years ago |
|
wangning
|
25d6d34a3f
|
update
|
7 years ago |
|
wangning
|
115e2ffbee
|
contract
|
7 years ago |
|
eason.qian
|
5d79371788
|
new act
|
7 years ago |
|
eason.qian
|
cf805e51b8
|
new act
|
7 years ago |
|
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
|
yixian
|
11a81ba7b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
7 years ago |
|
yixian
|
5c57271ea9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
715f718092
|
export error
|
7 years ago |
|
eason.qian
|
a0df3ab9ee
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
b9c4d60607
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
188ee72cd0
|
fix
|
7 years ago |
|
yixian
|
7aae1e7c6b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
b05de3e6ef
|
Merge branch 'hotfix20180306transdownload'
# Conflicts:
# src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
|
7 years ago |
|
yixian
|
b93660ca9e
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
8df1425bd2
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
3e13c03215
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
|
wangning
|
0bcce4efbc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
daae66eb96
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
3b7ff0c889
|
app udpate
|
7 years ago |
|
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
|
wangning
|
6b20fe43d6
|
device off line
|
7 years ago |
|
eason.qian
|
cfb3070c49
|
fix
|
7 years ago |
|
wangning
|
1c471262e4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7df8eff2fd
|
fixbug
|
7 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
349416eda6
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
cdb23f746b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
yixian
|
d273b75fbc
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
9f70551e39
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
138820f1bd
|
gst in surcharge config
|
7 years ago |
|
wangning
|
58f40e8248
|
device offline
|
7 years ago |
|
wangning
|
e363faba95
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
464fc1b474
|
update
|
7 years ago |
|
eason.qian
|
106ca85bfb
|
fix
|
7 years ago |
|
eason.qian
|
636ab2cf01
|
fix
|
7 years ago |
|
eason.qian
|
9b7c6ab014
|
fix
|
7 years ago |
|
wangning
|
e8478bb641
|
update
|
7 years ago |
|
eason.qian
|
4d2e010ed7
|
fix
|
7 years ago |
|
wangning
|
4eb69c41a0
|
update
|
7 years ago |
|
wangning
|
1fb82e3521
|
settlement add Tax amount
|
7 years ago |
|
wangning
|
2a9bf2e1db
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
d5acfc2bbd
|
remove unnecessary code
|
7 years ago |
|
eason.qian
|
b0ca17b063
|
orderDetail add tax_amount
|
7 years ago |
|
wangning
|
950fdc67e4
|
update
|
7 years ago |
|
wangning
|
df89d30232
|
update
|
7 years ago |
|
wangning
|
56335ed7f8
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7c0b958fee
|
bill Order Check Task
|
7 years ago |
|
Tayl0r
|
ee3e2605a3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
0e864e89a9
|
fix
|
7 years ago |
|
yuan
|
33e3ef225f
|
fix~
|
7 years ago |
|
Tayl0r
|
7a714d4862
|
fix
|
7 years ago |
|
eason.qian
|
d0b08c60fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
f1dcefc6ed
|
fix bd String
|
7 years ago |
|
Tayl0r
|
7f0c42f3b9
|
[Y] 支付宝线上清算预估
|
7 years ago |
|
Tayl0r
|
000ba24c1b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
1c538488b9
|
retail query daily transactions can choose dev only transactions
|
7 years ago |
|
wangning
|
82707c9d85
|
update
|
7 years ago |
|
eason.qian
|
ef2e90efbe
|
fix bd String
|
7 years ago |
|
eason.qian
|
f385c488a0
|
fix bd String
|
7 years ago |
|
Tayl0r
|
354b6b6595
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
dcd9c55f52
|
fix manager_id String
|
7 years ago |
|
eason.qian
|
68b42a4f85
|
fix bd_id String
|
7 years ago |
|
eason.qian
|
d1ec5620d5
|
fix
|
7 years ago |
|
Tayl0r
|
3d86ba8a9b
|
[Y] 修复清算预估
|
7 years ago |
|
eason.qian
|
6e9c1bbc4c
|
fix
|
7 years ago |
|
eason.qian
|
16282c0cab
|
Merge remote-tracking branch 'origin/transaction-up'
|
7 years ago |
|
macminiuser
|
e160be4afd
|
fix
|
7 years ago |
|
wangning
|
90baf73d49
|
update
|
7 years ago |
|
wangning
|
5148f6c15a
|
update
|
7 years ago |
|
wangning
|
c80e8689b0
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
f67edfcaf2
|
update
|
7 years ago |
|
wangning
|
308eca2a06
|
Merge branch 'develop_bill' into develop
|
7 years ago |
|
Tayl0r
|
599864897f
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
dc0c2d9275
|
[Y] 修复支付模板页
|
7 years ago |
|
wangning
|
52802a008a
|
update
|
7 years ago |
|
yuan
|
abce303d14
|
dashboard增加获取支付限额接口
|
7 years ago |
|
wangning
|
4684a955a0
|
Merge branch 'hotfix_asd'
|
7 years ago |
|
wangning
|
56290c7bdb
|
Merge branch 'hotfix_asd' into develop
|
7 years ago |
|
wangning
|
ab111ce878
|
update
|
7 years ago |
|
wangning
|
8f0ed0f051
|
update
|
7 years ago |
|
eason.qian
|
54e8c5bb6e
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
8e5e533678
|
账号修改，隐藏组织
|
7 years ago |
|
yuan
|
86b9770257
|
fix~
|
7 years ago |
|
yuan
|
fea62f737f
|
fix 账号组织bug，过滤manangerList
|
7 years ago |
|
wangning
|
d2ed6455d1
|
update
|
7 years ago |
|
yuan
|
f9a76696f5
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
e7c5ed66c4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
Tayl0r
|
6af568cff4
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
f9d4a39cf1
|
[Y] 指定退款审核人
|
7 years ago |
|
yuan
|
f4cb0221fe
|
修改交易额
|
7 years ago |
|
yuan
|
e968c49c2b
|
fix 账号组织bug
|
7 years ago |
yixian
|
c71e629188
|
gst support
|
7 years ago |
|
yuan
|
bf9a4f81e0
|
二级组织费率限制
|
7 years ago |
|
wangning
|
db26a8bc29
|
update
|
7 years ago |
|
eason.qian
|
b169e046b4
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
c228696136
|
fix~
|
7 years ago |
|
wangning
|
bf69dfbfe5
|
add cancle time
|
7 years ago |
|
wangning
|
7728c15c81
|
update
|
7 years ago |
|
wangning
|
85e9c392f9
|
update
|
7 years ago |
|
wangning
|
b476f2f898
|
update
|
7 years ago |
|
macminiuser
|
8bacdb61ea
|
交易额+退款+退款+退款笔数+App流水接口、交易额相关接口调整
|
7 years ago |
|
wangning
|
b89f0072c4
|
update
|
7 years ago |
|
eason.qian
|
e53f2eab57
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
d3c0f138c4
|
开放Cashier的settlement log下载权限
|
7 years ago |
