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 |
