eason
|
0112826495
|
汇付短链接支付页
|
7 years ago |
yuan
|
c5059d5917
|
增加交易额周期性对比
|
7 years ago |
Tayl0r
|
97c885237b
|
[Y] 日志新增节点ip
|
7 years ago |
|
yuan
|
f451ee4117
|
fix bug
|
7 years ago |
|
eason
|
5f95e05c4c
|
fix 商户清算列表在发送邮件之前不显示清算记录
|
7 years ago |
wangning
|
9b047f6541
|
update
|
7 years ago |
|
wangning
|
00cfd7cb96
|
update
|
7 years ago |
|
wangning
|
bc20a8a3dc
|
update
|
7 years ago |
|
wangning
|
fad755de8d
|
update mongo log
|
7 years ago |
|
wangning
|
ce5e9c574f
|
update mongo log
|
7 years ago |
|
wangning
|
65baad8331
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
cfbf224f9d
|
add test
|
7 years ago |
|
wangning
|
584eeff188
|
tmp
|
7 years ago |
|
yuan
|
1650f51396
|
add 1、gateway_alipay_online开关,2、ali_sub_merchant_id 配置
|
7 years ago |
|
wangning
|
2203c4e869
|
Merge branch 'hotfix2' into develop
|
7 years ago |
|
wangning
|
0e65780bbe
|
update
|
7 years ago |
|
wangning
|
3d5cbc8994
|
Merge branch 'hotfix2' into develop
|
7 years ago |
|
wangning
|
e9b9f16909
|
update
|
7 years ago |
|
wangning
|
63bdc1ce24
|
tmp
|
7 years ago |
yixian
|
c8e711f660
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
aec96b78d1
|
fix abafile
|
7 years ago |
|
yuan
|
debc6ea13c
|
增加取消订阅邮件管理
|
7 years ago |
|
wangning
|
bf6bd34e36
|
update
|
7 years ago |
|
wangning
|
0d9612e587
|
add config operation log
|
7 years ago |
|
wangning
|
d639c584fb
|
update
|
7 years ago |
|
wangning
|
c583d3054c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
dfb700607f
|
init unsub mail
|
7 years ago |
|
yuan
|
431ad49dbc
|
隐藏account_no
|
7 years ago |
|
wangning
|
3395120f3c
|
update
|
7 years ago |
|
wangning
|
2cd21677b4
|
update
|
7 years ago |
|
wangning
|
54ee965213
|
add ali_sub_id
|
7 years ago |
|
wangning
|
968d367d6e
|
update
|
7 years ago |
|
wangning
|
bb55dec303
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
57d78195f9
|
update
|
7 years ago |
|
wangning
|
793f920e2b
|
update
|
7 years ago |
|
wangning
|
0933303468
|
update
|
7 years ago |
|
wangning
|
27996f9136
|
send notify filter address
|
7 years ago |
|
wangning
|
3186110157
|
update
|
7 years ago |
|
wangning
|
b7386bc81b
|
add unsub mail list
|
7 years ago |
|
wangning
|
4cb5afca1a
|
Merge branch 'hotfixa' into develop
|
7 years ago |
|
wangning
|
45ab7acee0
|
update
|
7 years ago |
|
wangning
|
10b60ec4a3
|
tmp
|
7 years ago |
|
wangning
|
6728986797
|
update
|
7 years ago |
|
wangning
|
8de77da823
|
update
|
7 years ago |
|
wangning
|
605acc6ebc
|
update
|
7 years ago |
|
wangning
|
d7db6a1229
|
update
|
7 years ago |
|
wangning
|
e27ec59a6a
|
update
|
7 years ago |
|
wangning
|
eff977631e
|
update
|
7 years ago |
|
wangning
|
7af74cb593
|
add apply source
|
7 years ago |
|
wangning
|
531ffd16b6
|
update
|
7 years ago |
|
wangning
|
f765d896d3
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
ed28003e69
|
update
|
7 years ago |
|
wangning
|
ffa9dbe96e
|
merge conflict
|
7 years ago |
|
wangning
|
98101df7ac
|
update
|
7 years ago |
|
wangning
|
349083a52c
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
d9a801b431
|
tmp
|
7 years ago |
|
wangning
|
47a3d005e9
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
ad570266df
|
optimum
|
7 years ago |
|
wangning
|
6bd11ee479
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
|
7 years ago |
|
wangning
|
48aaee99bb
|
fixbug
|
7 years ago |
|
wangning
|
7404784130
|
add detail
|
7 years ago |
|
wangning
|
c4d142532a
|
tmp
|
7 years ago |
|
wangning
|
122d51ad2b
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
4c17f89e4d
|
fixbug
|
7 years ago |
|
wangning
|
751206814b
|
商户费率自动续签，GST自动变为自己承担
|
7 years ago |
|
yixian
|
b331b211aa
|
fix nullpointer error
|
7 years ago |
|
wangning
|
a5ff2cca40
|
update
|
7 years ago |
|
wangning
|
5f0fe940cc
|
update
|
7 years ago |
|
wangning
|
8265e198f1
|
auditmodify add method getOpen_status
|
7 years ago |
|
wangning
|
808cbc40b6
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
3650e2f7be
|
update
|
7 years ago |
|
eason
|
a1917adbc1
|
fix
|
7 years ago |
|
yuan
|
4c66cb13b7
|
商户端增加require_remark，require_custinfo开关设置，Dashboard优化，修改bug
|
7 years ago |
|
wangning
|
c1518c0d78
|
update
|
7 years ago |
|
wangning
|
f40893bc1b
|
Merge branch 'hotfix'
|
7 years ago |
|
wangning
|
1e504da6c5
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
3bff0e783f
|
update
|
7 years ago |
|
wangning
|
068904c74b
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
215a9afb68
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
ab42149104
|
rollback mailgun
|
7 years ago |
|
wangning
|
51136611b0
|
update
|
7 years ago |
|
wangning
|
c743e6a279
|
app modify cache flush
|
7 years ago |
|
wangning
|
bd7121c4a0
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
6dd2ad6111
|
update
|
7 years ago |
|
yuan
|
90c59d2b24
|
fix~
|
7 years ago |
|
wangning
|
a8d6854670
|
update
|
7 years ago |
|
wangning
|
e013b87ec5
|
update
|
7 years ago |
|
wangning
|
a7dc9668dc
|
update
|
7 years ago |
|
wangning
|
d03222cbf5
|
apply to compliance add condition
|
7 years ago |
|
wangning
|
29770d63d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
a74831988b
|
update
|
7 years ago |
|
yuan
|
497815c33c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
5661a0fd1e
|
fix~
|
7 years ago |
|
eason
|
f11a3a408b
|
fix bsb number api
|
7 years ago |
|
yuan
|
5f88caca01
|
fix~
|
7 years ago |
|
yuan
|
b65f8f0a15
|
增加商户交易额导出功能
|
7 years ago |
|
wangning
|
58d1dc0797
|
udpate
|
7 years ago |
|
wangning
|
29ee5e46f7
|
udpate
|
7 years ago |
|
wangning
|
cf425c44dc
|
update
|
7 years ago |
|
wangning
|
ef62dcd62f
|
add log
|
7 years ago |
|
wangning
|
88a28d82ae
|
udpate
|
7 years ago |
|
wangning
|
d47602829e
|
update
|
7 years ago |
|
wangning
|
c2595dec95
|
update
|
7 years ago |
|
wangning
|
f32c5f78e2
|
Send Verify Mail
|
7 years ago |
|
wangning
|
95075381f5
|
compliance_audit
|
7 years ago |
|
wangning
|
8cadcab799
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
57ee6e86bb
|
mailgun list add & remove
|
7 years ago |
|
wangning
|
a1c3f6d67e
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
e22617082e
|
update
|
7 years ago |
|
wangning
|
ea90957965
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
4651e63a0a
|
update
|
7 years ago |
|
wangning
|
3b9038eab6
|
update
|
7 years ago |
|
wangning
|
dd46237aee
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
32d34e4979
|
fixbug
|
7 years ago |
|
wangning
|
1ce6312a50
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
eb9595b126
|
同步删除mailgun
|
7 years ago |
|
wangning
|
c12dd88236
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
b90dc9d489
|
fixbug
|
7 years ago |
|
wangning
|
273ee2def4
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
72454b3a49
|
fixbug
|
7 years ago |
|
wangning
|
7772f971de
|
fixbug
|
7 years ago |
|
wangning
|
d0ffdafd0c
|
fixbug
|
7 years ago |
|
wangning
|
9a226c784e
|
fixbug
|
7 years ago |
|
wangning
|
769d28d28b
|
fixbug
|
7 years ago |
|
wangning
|
e17b2ffbae
|
add log
|
7 years ago |
|
wangning
|
60b347d5f1
|
add log
|
7 years ago |
|
wangning
|
b22b39cc4e
|
add log
|
7 years ago |
|
wangning
|
418ea1dca5
|
add log
|
7 years ago |
|
wangning
|
58a2011053
|
add log
|
7 years ago |
|
wangning
|
e47b386e25
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c7bb10d30c
|
add log
|
7 years ago |
|
yuan
|
0be9a6548d
|
fix~
|
7 years ago |
|
yuan
|
ee0b68e8a5
|
fix~
|
7 years ago |
|
yuan
|
b7241f6e9e
|
fix~
|
7 years ago |
|
yuan
|
20bdd9a5b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
28c714d9c8
|
fix~
|
7 years ago |
|
wangning
|
d535f982e4
|
tmp
|
7 years ago |
|
yuan
|
7e2e560e54
|
增加自主申请查询列表
|
7 years ago |
|
wangning
|
9822eff9a8
|
tmp
|
7 years ago |
|
wangning
|
5e870b307a
|
Merge branch 'develop_app' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
wangning
|
84ccd1dd85
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
a78fa866c9
|
Merge branch 'hotfi' into develop
|
7 years ago |
|
wangning
|
28d72b83bc
|
bugfix
|
7 years ago |
|
yuan
|
69ebfcb07f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
b7e978d8c8
|
fix~
|
7 years ago |
|
yixian
|
d783ee0639
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
8cf06cdfce
|
fix nullpointer error
|
7 years ago |
|
wangning
|
abc6ba1d7c
|
测试配置
|
7 years ago |
|
wangning
|
da4a151e81
|
update
|
7 years ago |
|
wangning
|
24e1c25672
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
|
7 years ago |
|
wangning
|
347e63152f
|
Merge branch 'hotfix'
|
7 years ago |
|
wangning
|
3526941e60
|
update
|
7 years ago |
|
wangning
|
9d41194522
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
653776594b
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
|
7 years ago |
|
wangning
|
9fbabffb43
|
update
|
7 years ago |
|
eason.qian
|
e8102a27fd
|
fix
|
7 years ago |
|
eason.qian
|
a0d151d8bd
|
fix 批量修改商户BD
|
7 years ago |
|
eason.qian
|
e3d90debbb
|
fix nap 订单 用户头像
|
7 years ago |
|
wangning
|
fc2730c5df
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
954ea54a74
|
update
|
7 years ago |
|
wangning
|
5055bcdd23
|
test
|
7 years ago |
|
yuan
|
6981aa715e
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
23d5d80c14
|
修改dashboard.html
|
7 years ago |
|
yuan
|
e9f24a5efb
|
Merge branch 'fix_dashboard_6/1' into develop
|
7 years ago |
|
yuan
|
56a6497dbb
|
fix~~
|
7 years ago |
|
wangning
|
280588a2f9
|
rollback
|
7 years ago |
|
wangning
|
5e077000de
|
测试配置
|
7 years ago |
|
wangning
|
50afd1207d
|
rollback
|
7 years ago |
|
wangning
|
c971f2005c
|
测试配置
|
7 years ago |
|
wangning
|
5479061946
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
0bc2a07513
|
update
|
7 years ago |
|
yuan
|
793157403e
|
fix~~
|
7 years ago |
|
yuan
|
a1b2ff0474
|
fix~~
|
7 years ago |
|
wangning
|
0c5f5cb392
|
fixbug mail bug
|
7 years ago |
|
wangning
|
1399fb38a5
|
fixbug mail bug
|
7 years ago |
|
wangning
|
ff5494efc3
|
rollback
|
7 years ago |
|
wangning
|
b5e85a0c7c
|
测试放开
|
7 years ago |
|
wangning
|
9ffd3f7643
|
update
|
7 years ago |
|
wangning
|
4956878da7
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
a85861aa30
|
update
|
7 years ago |
|
wangning
|
838a835cf1
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
b5662ee0df
|
bug fix
|
7 years ago |
|
wangning
|
c9777087f1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
b4277bfcc5
|
自助进件费率配置分开
|
7 years ago |
|
wangning
|
8ccde3e5a9
|
tmp
|
7 years ago |
|
wangning
|
ead3536fab
|
update
|
7 years ago |
|
yuan
|
ca079894b2
|
fix~~
|
7 years ago |
|
wangning
|
7a55463794
|
添加修改商户基本信息接口
|
7 years ago |
|
wangning
|
fe9d052c09
|
Merge branch 'develop' into develop_app
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
7 years ago |
|
wangning
|
0489cbf660
|
update
|
7 years ago |
|
wangning
|
92ab3b61f4
|
add permission
|
7 years ago |
|
yuan
|
9eb09f0ef6
|
fix~~
|
7 years ago |
|
wangning
|
67b311743d
|
fixbug
|
7 years ago |
|
wangning
|
ef8a137f1e
|
update
|
7 years ago |
|
yuan
|
f01153e10d
|
fix~~
|
7 years ago |
|
yuan
|
50cbf69892
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
c9246bf5f3
|
fix~~
|
7 years ago |
|
wangning
|
e286ab5f61
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
995e469569
|
update
|
7 years ago |
|
yuan
|
cae8827a21
|
fix~~
|
7 years ago |
|
yuan
|
58d4b60f16
|
fix~~
|
7 years ago |
|
wangning
|
7d18e08d06
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7a882c68c3
|
删除多余代码
|
7 years ago |
|
yuan
|
fc22769d38
|
fix~~
|
7 years ago |
|
yuan
|
eb593c6c33
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
b713f8f1fd
|
fix~~
|
7 years ago |
|
wangning
|
362eb8a3c8
|
udpate
|
7 years ago |
|
wangning
|
11cde27af2
|
update industry
|
7 years ago |
|
yuan
|
4ebf2f25d6
|
fix~~
|
7 years ago |
|
yuan
|
db58007ee7
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
451b6f2a7b
|
fix~~
|
7 years ago |
|
wangning
|
4a0b57c76f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
yuan
|
e6ac37fd05
|
fix~~
|
7 years ago |
|
wangning
|
6e531b006b
|
update
|
7 years ago |
|
wangning
|
192a3ddf83
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5ac7c7322c
|
1.add country default value
2.generate contract ignore source=4
|
7 years ago |
|
yuan
|
4dabd64c45
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
bc971bd8b5
|
fix~~
|
7 years ago |
|
wangning
|
139eade7ee
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
yuan
|
40d2e729a1
|
fix~~
|
7 years ago |
|
wangning
|
2a498263b7
|
update
|
7 years ago |
|
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 |
