kira
|
0769799a01
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
470c234209
|
update
|
6 years ago |
|
kira
|
6e54e0cd66
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
21b3c4dd74
|
update
|
6 years ago |
|
kira
|
eed179214b
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
# src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml
# src/main/ui/static/actchairty/templates/act_chairty_merchants.html
|
6 years ago |
|
kira
|
de82418d70
|
encourage money
|
6 years ago |
yuan
|
bf0c4366b7
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
189e37f2a0
|
add risk merchants html
|
6 years ago |
|
yuan
|
5105bdc6d2
|
add risk merchants html
|
6 years ago |
luoyang14z7
|
4f596ec1d3
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
45629cb0de
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
9e8f4f0b08
|
Merge remote-tracking branch 'master/develop' into develop
|
6 years ago |
|
kira
|
b69737a554
|
update
|
6 years ago |
|
kira
|
ed032015bc
|
update
|
6 years ago |
|
kira
|
735aaadc27
|
update
|
6 years ago |
eason
|
77bb3ea3b5
|
fix actChairty
|
6 years ago |
|
luoyang14z7
|
2ef48835b7
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
af40eff1b5
|
fix : ActChairty
|
6 years ago |
|
kira
|
bd7786e40f
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a2c3128cb0
|
add log
|
6 years ago |
|
luoyang14z7
|
b182cb794b
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
b3d57f7bd9
|
fix : ActChairty
|
6 years ago |
|
kira
|
c18da355f0
|
update
|
6 years ago |
|
kira
|
70e234eff7
|
update act images
|
6 years ago |
|
kira
|
106c9b98c6
|
update
|
6 years ago |
|
kira
|
2d530b36c8
|
update act images
|
6 years ago |
|
eason
|
446f394428
|
fix encourage
|
6 years ago |
|
luoyang14z7
|
dbfa229946
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
ef3cd5d822
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
d5a2bfcb6f
|
fix : ActChairty
|
6 years ago |
|
yuan
|
48227e3705
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yuan
|
69a8655128
|
fix html
|
6 years ago |
|
kira
|
119830f78c
|
update act images
|
6 years ago |
|
kira
|
8db86c6534
|
update act images
|
6 years ago |
|
kira
|
c9bfd87714
|
update
|
6 years ago |
|
kira
|
026265fbaf
|
fix
|
6 years ago |
|
kira
|
f9bde28cb7
|
update sql
|
6 years ago |
|
kira
|
db1298a2d7
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a7b3e33ada
|
update
|
6 years ago |
|
yuan
|
f41822308f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
26d1390bcd
|
fix html
|
6 years ago |
|
kira
|
337ce2f305
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
b0fb825888
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
f7a78e6aac
|
update chairty image
|
6 years ago |
|
kira
|
954b9b6fd2
|
tmp
|
6 years ago |
|
eason
|
4a170a5f94
|
fix
|
6 years ago |
|
yuan
|
0a946ac1db
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
4291a53304
|
fix html
|
6 years ago |
|
luoyang14z7
|
fc4646a770
|
fix : chairty
|
6 years ago |
|
kira
|
b3f1d26e7c
|
tmp
|
6 years ago |
|
kira
|
052fce1894
|
tmp
|
6 years ago |
|
kira
|
170b78cc45
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
d61807c470
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
3b388a57b2
|
fixbug unread notice
|
6 years ago |
|
eason
|
413f38b1af
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/db/modify.sql
|
6 years ago |
|
kira
|
2416999408
|
update
|
6 years ago |
|
luoyang14z7
|
dc9a21b07f
|
fix : develop_act_Chairty
|
6 years ago |
|
eason
|
e4eac97729
|
Merge branch 'new_bd_commissions' into develop
|
6 years ago |
|
kira
|
ed42133822
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
kira
|
59bb6d7160
|
tmp
|
6 years ago |
|
luoyang14z7
|
48d5daf4ca
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
3cd97ffbde
|
fix : develop_act_Chairty
|
6 years ago |
|
kira
|
8a5a0b0237
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
kira
|
0c76b953a6
|
init
|
6 years ago |
|
luoyang14z7
|
0bbd6b8297
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
df14273f57
|
fix : develop_act_Chairty
|
6 years ago |
|
kira
|
9b7e268788
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
luoyang14z7
|
d490fbc865
|
add : develop_act_Chairty
|
6 years ago |
|
yuan
|
4ffb9f7bcd
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
1aabaa91ad
|
move html
|
6 years ago |
|
yuan
|
3e48a1c82a
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
ba846d542b
|
add html
|
6 years ago |
|
wangning
|
ec4fe4976e
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
9ea819a9df
|
add act charity
|
6 years ago |
|
wangning
|
6c7d02be00
|
update
|
6 years ago |
|
yuan
|
b2533ca349
|
fix BD Commissions
|
6 years ago |
|
wangning
|
df0616707e
|
update 文案
|
6 years ago |
|
wangning
|
8523b40ffb
|
udpate
|
6 years ago |
|
wangning
|
82df945256
|
update
|
6 years ago |
|
luoyang14z7
|
08b1230f4f
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
8f7d5f42c5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
9ca8f47d09
|
Merge branch 'develop_client_permission' of https://git.royalpay.com.au/git/royalv2.manage into develop_client_permission
|
6 years ago |
|
yuan
|
0a13bcd876
|
fix BD Commissions
|
6 years ago |
|
wangning
|
5ad385d8af
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
93ae3a7275
|
fix : develop_client_permission
|
6 years ago |
|
luoyang14z7
|
77e0bc1044
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
2cec4309b5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
71303e4629
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
6e049b7dcb
|
add images
|
6 years ago |
|
luoyang14z7
|
9e5e07daef
|
add : addPartner Auto Permission_Modules_Client
|
6 years ago |
|
eason
|
9d39e2cad6
|
fix
|
6 years ago |
|
wangning
|
9448ee6bb2
|
add permission check
|
6 years ago |
|
yuan
|
0e5e7270dc
|
fix BD Commissions
|
6 years ago |
|
wangning
|
ac472773f6
|
update
|
6 years ago |
|
wangning
|
2b3671a8af
|
merge
|
6 years ago |
|
wangning
|
fdab9c1d4c
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
1adf649076
|
add : partner Permission
|
6 years ago |
|
wangning
|
2de776e4ca
|
update
|
6 years ago |
|
yuan
|
c86e760dc8
|
fix BD Commissions
|
6 years ago |
|
eason
|
ac40e858da
|
fix bd commission
|
6 years ago |
|
wangning
|
4b53fee85c
|
update
|
6 years ago |
|
wangning
|
6b429eddb9
|
update
|
6 years ago |
|
wangning
|
208ac577c3
|
update
|
6 years ago |
|
wangning
|
cd50cbf719
|
add cache clearing
|
6 years ago |
|
wangning
|
6c752a3e0b
|
add client permission page
|
6 years ago |
|
yuan
|
9b031f73bb
|
fix BD Commissions
|
6 years ago |
|
wangning
|
9d50f0c687
|
tmp
|
6 years ago |
|
wangning
|
dfdb0bcac2
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
33c477a30c
|
fixedDocument
|
6 years ago |
|
wangning
|
80332ebeac
|
tmp
|
6 years ago |
|
wangning
|
36cac76a91
|
tmp
|
6 years ago |
|
eason
|
216c4d072c
|
fix
|
6 years ago |
|
yuan
|
a4fb797cf0
|
fix bug
|
6 years ago |
|
eason
|
103ca68c2d
|
fix
|
6 years ago |
|
luoyang14z7
|
6454b39f91
|
注释auto add partner
|
6 years ago |
|
luoyang14z7
|
1ecbc4894f
|
Merge branch 'devtools' into develop
|
6 years ago |
|
eason
|
309568e67f
|
fix
|
6 years ago |
|
luoyang14z7
|
ec3139d99c
|
devtools:addaliexport
|
6 years ago |
|
luoyang14z7
|
9e9f472f3d
|
devtools : add
|
6 years ago |
|
luoyang14z7
|
f70ead46a9
|
devtools
|
6 years ago |
|
yuan
|
1781257140
|
fix bug
|
6 years ago |
|
yuan
|
479009d671
|
fix bug
|
6 years ago |
|
yuan
|
4ba4599b06
|
fix bug
|
6 years ago |
|
yuan
|
a22d860bd4
|
fix bug
|
6 years ago |
|
yuan
|
d163eb9949
|
增加hf pay intro
|
6 years ago |
|
yuan
|
e598d77925
|
增加hfindustry
|
6 years ago |
|
eason
|
20360ade11
|
fix hf css
|
6 years ago |
|
eason
|
573e3da805
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
6c1497b81e
|
fix hf css
|
6 years ago |
|
wangning
|
62e2850ce8
|
add hf apidoc
|
6 years ago |
|
eason
|
212f9411d7
|
fix hf css
|
6 years ago |
|
eason
|
877163f09c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
91bcf7f9b3
|
fix hf
|
6 years ago |
|
yuan
|
e0ffd52989
|
Merge branch '6/29' into develop
|
6 years ago |
|
yuan
|
a498e4dcd4
|
fix bug
|
6 years ago |
|
yuan
|
d2b8fe4109
|
Merge branch 'fix_6/29' into develop
|
6 years ago |
|
yuan
|
f06271cd09
|
修改自助申请列表bug
|
6 years ago |
|
eason
|
0fe284cff8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
3d6e0fa003
|
fix
|
6 years ago |
|
yuan
|
410d1519de
|
fix html
|
6 years ago |
|
yuan
|
744a9b8463
|
Merge branch 'local_HF' into develop
|
6 years ago |
|
wangning
|
caab7a5c1c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
d83a5d5a32
|
rollback point
|
6 years ago |
|
yuan
|
7e490fa7cd
|
add gateway 14
|
6 years ago |
|
eason
|
3d01808106
|
fix
|
6 years ago |
|
eason
|
3ab85dd480
|
fix
|
6 years ago |
|
yuan
|
62ad8b34f0
|
Merge branch 'develop' into local_HF
|
6 years ago |
|
yuan
|
3b399f69c6
|
fix html bug
|
6 years ago |
|
yuan
|
66ba4c7074
|
add getaway 14
|
6 years ago |
|
yuan
|
0be969f168
|
fix bug
|
6 years ago |
|
yuan
|
cbb7ac69a4
|
add getaway 14
|
6 years ago |
|
yuan
|
b5695df77b
|
fix html
|
6 years ago |
|
yuan
|
d5c04c61b3
|
add apply handle
|
6 years ago |
|
yuan
|
0df950683d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
b164e32641
|
fix
|
6 years ago |
|
yuan
|
f83270be4c
|
add enable_link
|
6 years ago |
|
eason
|
9c5e11b7eb
|
fix
|
6 years ago |
|
eason
|
b80cc8d191
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
4b79f3fe60
|
fix
|
6 years ago |
|
wangning
|
42b242b8de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
9ddfe7ef1f
|
add hf
|
6 years ago |
|
eason
|
48d2d7b58e
|
fix app settlement log
|
6 years ago |
|
yuan
|
2f7c05f474
|
Merge branch 'develop' into local_HF
# Conflicts:
# src/db/modify.sql
|
6 years ago |
|
yuan
|
6ca6628c12
|
fix apply
|
6 years ago |
|
yuan
|
7b4f2241c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
c2ef822d7d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
d48d4393d1
|
short url
|
6 years ago |
|
yuan
|
82a00fe302
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
f226209c9a
|
settle mail fix
|
6 years ago |
|
yixian
|
c30b9f0d72
|
ui update
|
6 years ago |
|
yixian
|
a779b081a6
|
ui update
|
6 years ago |
|
wangning
|
7b65dacb00
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
60f5594796
|
remove transaction
|
6 years ago |
|
yixian
|
98ae44a567
|
fix ui bug
|
6 years ago |
|
yixian
|
76600c5dfd
|
fix ui bug
|
6 years ago |
|
yixian
|
ca67b30db2
|
fix ui bug
|
6 years ago |
|
yixian
|
2d18aea16b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
c4622ada47
|
fix ui bug
|
6 years ago |
|
eason
|
b5156708f0
|
fix 清算记录未完成区别显示逻辑
|
6 years ago |
|
yuan
|
4cc03be2dc
|
Merge branch 'invoice_fix' into develop
|
6 years ago |
|
yuan
|
f4899470bd
|
fix bug
|
6 years ago |
|
yixian
|
8e78d70a7e
|
Round Half Down edit to prevent deprecated warnings
|
6 years ago |
|
yixian
|
af2e674a2b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
0d48030501
|
distribute bank ui
|
6 years ago |
|
yuan
|
c8262648f0
|
Merge branch 'invoice_fix' into develop
|
6 years ago |
|
yuan
|
4fa475fbb1
|
fix invoice bug
|
6 years ago |
|
yixian
|
a4bfebe22a
|
settle log view edit
|
6 years ago |
|
yixian
|
0de03e2364
|
distribute bank
|
6 years ago |
|
yuan
|
ff68ca6b20
|
Merge branch 'invoice_fix' into develop
|
6 years ago |
|
yuan
|
418a84b7bd
|
fix invoice bug
|
6 years ago |
|
yixian
|
20addb778a
|
display multi banks
|
6 years ago |
|
eason
|
c557a7f939
|
fix hf css
|
6 years ago |
|
eason
|
a8e4f6ef33
|
fix hf css
|
6 years ago |
|
yuan
|
810d3ede34
|
fix~
|
6 years ago |
|
yuan
|
6c5680f78e
|
fix dashboard
|
6 years ago |
|
yuan
|
083abdf117
|
fix~
|
7 years ago |
|
yuan
|
440cacb194
|
fix bug
|
7 years ago |
|
yuan
|
a7436b842d
|
add~
|
7 years ago |
|
eason
|
69bd35bb1b
|
fix color
|
7 years ago |
|
eason
|
a9be0b6811
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
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
|
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
|
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
|
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
|
ed28003e69
|
update
|
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 |
