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 |
