yuan
|
f01153e10d
|
fix~~
|
6 years ago |
|
yuan
|
50cbf69892
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
c9246bf5f3
|
fix~~
|
6 years ago |
wangning
|
e286ab5f61
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
995e469569
|
update
|
6 years ago |
|
yuan
|
cae8827a21
|
fix~~
|
6 years ago |
|
yuan
|
58d4b60f16
|
fix~~
|
6 years ago |
|
wangning
|
7d18e08d06
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
7a882c68c3
|
删除多余代码
|
6 years ago |
|
yuan
|
fc22769d38
|
fix~~
|
6 years ago |
|
yuan
|
eb593c6c33
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
b713f8f1fd
|
fix~~
|
6 years ago |
|
wangning
|
362eb8a3c8
|
udpate
|
6 years ago |
|
wangning
|
11cde27af2
|
update industry
|
6 years ago |
|
yuan
|
4ebf2f25d6
|
fix~~
|
6 years ago |
|
yuan
|
db58007ee7
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
451b6f2a7b
|
fix~~
|
6 years ago |
|
wangning
|
4a0b57c76f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
yuan
|
e6ac37fd05
|
fix~~
|
6 years ago |
|
wangning
|
6e531b006b
|
update
|
6 years ago |
|
wangning
|
192a3ddf83
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
5ac7c7322c
|
1.add country default value
2.generate contract ignore source=4
|
6 years ago |
|
yuan
|
4dabd64c45
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
bc971bd8b5
|
fix~~
|
6 years ago |
|
wangning
|
139eade7ee
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
yuan
|
40d2e729a1
|
fix~~
|
6 years ago |
|
wangning
|
2a498263b7
|
update
|
6 years ago |
|
yuan
|
455eedbcd5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
5b7349dbb8
|
fix~~
|
6 years ago |
|
wangning
|
843dbce89f
|
update
|
6 years ago |
|
wangning
|
71d25d675d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
037c8adfa3
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
a99828d095
|
update
|
6 years ago |
|
yuan
|
49ad834a79
|
fix~~
|
6 years ago |
eason.qian
|
46302d675a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
39e0d81d8a
|
fix
|
6 years ago |
|
yuan
|
d8bf233bd3
|
fix~~
|
6 years ago |
|
eason.qian
|
4f28d86abd
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
4cb89bf3ab
|
fix
|
6 years ago |
|
wangning
|
535e43dcb8
|
update
|
6 years ago |
|
eason.qian
|
82353cfe20
|
fix
|
6 years ago |
|
yuan
|
518228fc38
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
7f69e34750
|
fix~~
|
6 years ago |
|
wangning
|
2b43a58632
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
a9bb6143b5
|
update
|
6 years ago |
|
yuan
|
7c4529e382
|
fix~~
|
6 years ago |
|
yuan
|
dd228d86c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
ba0b61b701
|
fix~~
|
6 years ago |
|
wangning
|
8359b31873
|
update
|
6 years ago |
|
wangning
|
a49313d0b7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
91e340f3c8
|
update
|
6 years ago |
|
wangning
|
99df2c0e9f
|
update
|
6 years ago |
|
yuan
|
1d5fd9f31e
|
fix~~
|
6 years ago |
|
yuan
|
8b8d2adb15
|
fix~~
|
6 years ago |
|
yuan
|
e28a3f1f9f
|
add ~
|
6 years ago |
|
yuan
|
30210a2c44
|
fix~
|
6 years ago |
|
wangning
|
a9c50800b0
|
add file interface
|
6 years ago |
|
yuan
|
e0bde1934d
|
add~
|
6 years ago |
|
yuan
|
c76c1f3a63
|
fix~
|
6 years ago |
|
yuan
|
7c8188466c
|
fix~
|
6 years ago |
|
yuan
|
198953cbad
|
Merge branch 'clientApply' into develop
|
6 years ago |
|
yuan
|
c287b2ec13
|
fix~
|
6 years ago |
|
wangning
|
fe8f851731
|
update
|
6 years ago |
|
wangning
|
b028a0deb1
|
update
|
6 years ago |
|
wangning
|
a84406f6c0
|
update
|
6 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
|
6 years ago |
|
wangning
|
9059101594
|
update
|
6 years ago |
|
wangning
|
e9573f77f7
|
update
|
6 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
|
6 years ago |
|
wangning
|
55e7c465b3
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
d03ea655a4
|
update
|
6 years ago |
|
wangning
|
0b70be1e4e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
87a4dd4ac6
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
c327748b61
|
update
|
6 years ago |
|
yuan
|
483b3aa9c1
|
fix~
|
6 years ago |
|
wangning
|
943da647cb
|
update
|
6 years ago |
|
wangning
|
4bab6f1223
|
update
|
6 years ago |
|
wangning
|
e5ee89eb15
|
update
|
6 years ago |
|
wangning
|
b5f2f1ed29
|
update
|
6 years ago |
|
wangning
|
d9a6af58bb
|
update
|
6 years ago |
|
yuan
|
2ba51365ec
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
yuan
|
8131486839
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
wangning
|
3429300924
|
update
|
6 years ago |
|
wangning
|
51aa069acd
|
update
|
6 years ago |
|
wangning
|
73d07ba731
|
SettleMent Estimate alipayOnline
|
6 years ago |
|
wangning
|
2d8f06c845
|
update
|
6 years ago |
|
yuan
|
08f2736c8e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
89016d48f8
|
add getaway 13
|
6 years ago |
|
yuan
|
299f69957a
|
fix~
|
6 years ago |
|
yuan
|
f4da89ddcd
|
fix~
|
6 years ago |
|
wangning
|
24f3e1f356
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
6 years ago |
|
wangning
|
be7727061d
|
update
|
6 years ago |
|
wangning
|
d51a174b7e
|
update
|
6 years ago |
|
wangning
|
f502ac2f80
|
update
|
6 years ago |
|
eason.qian
|
9944407894
|
自助开通合规流程改造
|
6 years ago |
|
yuan
|
c7a80a9b26
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
yuan
|
74a59a1bd3
|
fix~
|
6 years ago |
|
wangning
|
c56773120d
|
update
|
6 years ago |
|
wangning
|
06a4804543
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
6 years ago |
|
wangning
|
df1e735eff
|
update
|
6 years ago |
|
yuan
|
19f0045183
|
fix~
|
6 years ago |
|
wangning
|
b4f76e8182
|
update
|
6 years ago |
|
wangning
|
6b83b79512
|
update
|
6 years ago |
|
wangning
|
914525f150
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/ui/merchant_application.html
|
6 years ago |
|
wangning
|
c6d83b1c5a
|
update
|
6 years ago |
|
wangning
|
ce27310c40
|
update
|
6 years ago |
|
yuan
|
1ff35dc8d1
|
fix~
|
6 years ago |
|
yuan
|
7c8c0c56c9
|
fix~
|
6 years ago |
|
wangning
|
41376c740f
|
update
|
6 years ago |
|
wangning
|
2d829fb746
|
update name
|
6 years ago |
|
wangning
|
0108ab9322
|
update
|
6 years ago |
|
wangning
|
1e97502b4b
|
update
|
6 years ago |
|
wangning
|
2b414c537d
|
update
|
6 years ago |
|
wangning
|
f6be2111f2
|
merge conflict
|
6 years ago |
|
wangning
|
5980813f58
|
update
|
6 years ago |
|
wangning
|
25f11e7c3c
|
update
|
6 years ago |
|
wangning
|
ed6d43b18a
|
add mail status
|
6 years ago |
|
yuan
|
2337e30251
|
fix~
|
6 years ago |
|
wangning
|
047ba2b7d7
|
update url
|
6 years ago |
|
yuan
|
0c393ef0bc
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
yuan
|
00655632b4
|
fix~
|
6 years ago |
|
wangning
|
c4f2de599e
|
update
|
6 years ago |
|
wangning
|
3bbf73298d
|
merge conflict
|
6 years ago |
|
wangning
|
45c8e9248c
|
update
|
6 years ago |
|
yuan
|
54f7f8ee9c
|
fix~
|
6 years ago |
|
yuan
|
9889521acd
|
fix~
|
6 years ago |
|
wangning
|
89d0c7a4ae
|
rollback
|
6 years ago |
|
wangning
|
3f03b2aa18
|
tmp
|
6 years ago |
|
wangning
|
e9be935d2a
|
update
|
6 years ago |
|
wangning
|
9da06355cb
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
0cbd63031f
|
update
|
6 years ago |
|
wangning
|
82562fb045
|
tmp
|
6 years ago |
|
wangning
|
fd74bf0e22
|
update
|
6 years ago |
|
yuan
|
5984216f64
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
eason.qian
|
2733a1ea76
|
fix
|
6 years ago |
|
wangning
|
15fe2c59fb
|
add verify mail & SMS code
|
6 years ago |
|
yuan
|
9d05f01072
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
|
6 years ago |
|
wangning
|
1842e10bb3
|
tmp
|
6 years ago |
|
wangning
|
543964051b
|
tmp
|
6 years ago |
|
wangning
|
48cc6509c0
|
tmp
|
6 years ago |
|
wangning
|
025c3525f2
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
67062c1930
|
add risk record authority
|
6 years ago |
|
wangning
|
09976bbab9
|
tmp
|
6 years ago |
|
yuan
|
3569ec32e9
|
Merge branch 'merchant_application' into clientApply
|
6 years ago |
|
yuan
|
de98a7c279
|
add
|
6 years ago |
|
wangning
|
687c8b10e7
|
Merge branch 'test' into develop
# Conflicts:
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
|
wangning
|
c81e91d1b2
|
update
|
6 years ago |
|
eason.qian
|
0851f793a0
|
Merge branch 'develop' into clientApply
|
6 years ago |
|
wangning
|
11cf6b5819
|
update
|
6 years ago |
|
wangning
|
55375af2ed
|
fix
|
6 years ago |
|
wangning
|
4dd95c3cf5
|
fix
|
6 years ago |
|
wangning
|
57b3a77fbd
|
update
|
6 years ago |
|
wangning
|
f24084254c
|
add log
|
6 years ago |
|
wangning
|
32a317c344
|
update
|
6 years ago |
|
eason.qian
|
b801aba02d
|
mailgun
|
6 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
|
6 years ago |
|
eason.qian
|
a4fb42ef4b
|
fix
|
6 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
|
6 years ago |
|
wangning
|
6ab808a45f
|
update
|
6 years ago |
|
wangning
|
128eddeb28
|
update
|
6 years ago |
|
wangning
|
c2d64ca19a
|
qrcode
|
6 years ago |
|
wangning
|
da05f901ca
|
qrcode
|
6 years ago |
Tayl0r
|
807166f6fc
|
log
|
6 years ago |
|
wangning
|
5661406e27
|
update
|
6 years ago |
|
wangning
|
2e01748e11
|
add maven test
|
6 years ago |
|
wangning
|
63a22cd783
|
update
|
6 years ago |
|
wangning
|
8f38a3f2c4
|
fix customer_order statics
|
6 years ago |
|
eason.qian
|
83f2de9c93
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason.qian
|
85bf0c378d
|
fix
|
6 years ago |
|
wangning
|
b569b5fc5d
|
update
|
6 years ago |
|
wangning
|
ad6243d386
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
b0050d60f1
|
merge conflict
|
6 years ago |
|
wangning
|
9540f99d86
|
modify task method name
|
6 years ago |
|
Tayl0r
|
126b6b59bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
Tayl0r
|
2dfb1a052a
|
[Y] 签名增加验证节点ip
|
6 years ago |
|
yuan
|
4c3360f9e5
|
fix html
|
6 years ago |
|
wangning
|
58b12d66b3
|
modify mail gun properties
|
6 years ago |
|
wangning
|
11e7bd5e13
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
54ae201cde
|
modify redpack send rule
|
6 years ago |
|
yuan
|
963c7951de
|
修改红包返现页面
|
6 years ago |
|
wangning
|
f7774cf14f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
9acc33a509
|
fixbug daily_transactions
|
6 years ago |
yixian
|
e386d9cfe8
|
Merge branch 'hotfix20180517compileerr' into develop
|
6 years ago |
|
yixian
|
d95e848045
|
compile error
|
6 years ago |
|
yixian
|
3034bf99fd
|
task edit for docker
|
6 years ago |
|
wangning
|
b55f8e3f9d
|
update
|
6 years ago |
|
wangning
|
601e678e09
|
update
|
6 years ago |
|
wangning
|
9a51b08d41
|
change microapp to MiniProgram
|
6 years ago |
|
wangning
|
7c0da6d5cf
|
update
|
6 years ago |
|
wangning
|
44087dd5d1
|
update
|
6 years ago |
|
wangning
|
2b2b5563d4
|
update
|
6 years ago |
|
yuan
|
68339f4027
|
订单查询增加gateway选项
|
6 years ago |
|
wangning
|
f32e2205fb
|
update
|
6 years ago |
|
yuan
|
139711f662
|
fix html
|
6 years ago |
|
wangning
|
b34e6b8f3c
|
update
|
6 years ago |
|
yuan
|
8f88d8084b
|
fix bug
|
6 years ago |
|
wangning
|
9126519dcf
|
merge
|
6 years ago |
|
wangning
|
adbfe6ca31
|
Merge branch 'mailgun' of https://git.royalpay.com.au/git/royalv2.manage into mailgun
|
6 years ago |
|
yuan
|
cfa1f5f6e0
|
add~
|
6 years ago |
|
wangning
|
74b685beb8
|
update
|
6 years ago |
|
wangning
|
1363061693
|
update
|
6 years ago |
|
wangning
|
a46cfe5444
|
modify mail send
|
6 years ago |
|
wangning
|
7e21301e7d
|
update
|
6 years ago |
|
wangning
|
f9f58012e4
|
add mailgun interface
|
6 years ago |
|
eason.qian
|
99487530a3
|
fix
|
6 years ago |
|
wangning
|
9a1844fa13
|
update
|
6 years ago |
|
wangning
|
e5ef17bd7e
|
update
|
6 years ago |
|
wangning
|
8512a9d0a9
|
add mailgun notify
|
6 years ago |
|
wangning
|
f7f5a925dc
|
tmp
|
6 years ago |
|
wangning
|
dc1f20c838
|
add mail test
|
6 years ago |
|
wangning
|
ec0ead8d68
|
update
|
6 years ago |
|
wangning
|
85b0f7d653
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
1d666071ff
|
add bill page
|
6 years ago |
|
yuan
|
0ce6b156dd
|
fix html~~~
|
6 years ago |
|
yuan
|
77621c6418
|
fix~
|
6 years ago |
|
wangning
|
536ea593b0
|
Merge branch 'hotfix_2' into develop
|
6 years ago |
|
wangning
|
194b5d60a2
|
fix bug
|
6 years ago |
|
wangning
|
6fc0474464
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
e63f08ba19
|
fix bug
|
6 years ago |
|
wangning
|
9cf07ff142
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
a5f97c0fa0
|
roll back
|
6 years ago |
|
wangning
|
0bdb01445b
|
roll back
|
6 years ago |
|
wangning
|
42a103901a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
14854979f8
|
close Estimate future interface
|
6 years ago |
|
wangning
|
ddee63590f
|
alsjd
|
6 years ago |
|
yuan
|
bce5a86aa4
|
fix bug~
|
6 years ago |
|
eason.qian
|
7f5dd867c3
|
fix
|
6 years ago |
|
yuan
|
c0fffb94e3
|
fix html
|
6 years ago |
|
yuan
|
2f2d21f03e
|
fix~
|
6 years ago |
|
yuan
|
f3f6af80f6
|
商户端增商户订单ID生成二维码功能
|
6 years ago |
|
wangning
|
f592cb4a7a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
665021e05d
|
bug fix
|
6 years ago |
|
yuan
|
631f705000
|
dashboard交易额增加缓存
|
6 years ago |
|
yuan
|
015e1e388d
|
风控记录增加筛选
|
6 years ago |
|
eason.qian
|
c0bd0d4d6c
|
fix
|
6 years ago |
|
wangning
|
0fe89dbde2
|
refuse apply
|
6 years ago |
|
wangning
|
59c1dfac8b
|
update customer impression work time
|
6 years ago |
|
wangning
|
8f6f81d00a
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
6 years ago |
|
wangning
|
579a1cc472
|
fixbug
|
6 years ago |
|
eason.qian
|
172cea098b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
eason.qian
|
4d412afb9f
|
Merge branch 'hotfix'
|
6 years ago |
|
eason.qian
|
38261ec614
|
fix
|
6 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 |
