kira
|
90b7c356d1
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
762a926d5a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
8bd679bd3d
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
a51df7da06
|
fixbug
|
6 years ago |
|
kira
|
bd63e07eb5
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
001ea48494
|
add log
|
6 years ago |
eason
|
5dfcefeeaa
|
fix prize
|
6 years ago |
|
eason
|
630e7940d5
|
fix prize
|
6 years ago |
|
eason
|
876b8cc46e
|
fix
|
6 years ago |
|
eason
|
611a4eb646
|
fix
|
6 years ago |
|
eason
|
376687f25b
|
fix bd prize
|
6 years ago |
|
eason
|
2627482fba
|
fix
|
6 years ago |
|
eason
|
04b3b7665a
|
bd
|
6 years ago |
|
kira
|
07d7995a6a
|
update
|
6 years ago |
yuan
|
a9308167d7
|
fix bug
|
6 years ago |
|
eason
|
010b8b63da
|
Merge branch 'hotfix_prize' into develop
|
6 years ago |
|
eason
|
c8657980cf
|
优化 BD提成查询
|
6 years ago |
|
yuan
|
e2f4073169
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
6058479d25
|
fix~
|
6 years ago |
|
kira
|
96298f95d4
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
5e0fa354b2
|
hide hf exchange rate
|
6 years ago |
|
kira
|
f461b3bfc4
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
e73790d84c
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
3307ce25b7
|
fixbug
|
6 years ago |
|
yuan
|
8af00b8798
|
fix bug
|
6 years ago |
|
kira
|
248d9d43ee
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
ea8025ff3d
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
5a0d041f9c
|
fixbug
|
6 years ago |
|
yuan
|
624022a67d
|
fix bug
|
6 years ago |
|
eason
|
154faf131b
|
fix
|
6 years ago |
|
kira
|
07d5402ae2
|
modify sms sender
|
6 years ago |
|
kira
|
f4c4e7a6e1
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
d50b476077
|
update
|
6 years ago |
|
kira
|
ab97b9a2ee
|
update
|
6 years ago |
|
yuan
|
9e0af4706f
|
fix bug
|
6 years ago |
|
yuan
|
35ae7dcc24
|
自主进件contact_phone加"+61"
|
6 years ago |
|
kira
|
125e6f9adc
|
update
|
6 years ago |
|
kira
|
5cfea84117
|
add log
|
6 years ago |
|
kira
|
e5a7a14d89
|
fixbug
|
6 years ago |
|
kira
|
fcb9a0ae6f
|
update
|
6 years ago |
|
kira
|
857c4517a8
|
tmp
|
6 years ago |
|
kira
|
d742d4b3cf
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
5ad8390bc9
|
update
|
6 years ago |
|
yuan
|
777899087c
|
增加支付宝支付限额
|
6 years ago |
|
kira
|
3064b64ecb
|
fixbug
|
6 years ago |
|
kira
|
1bc4c2d6d9
|
update
|
6 years ago |
luoyang14z7
|
091fb0c830
|
fix : PartnerPermiss
|
6 years ago |
|
kira
|
0c2afb0c81
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a889d06770
|
update
|
6 years ago |
yixian
|
e11a5b4d92
|
settlement detail
|
6 years ago |
|
yuan
|
1eb2326941
|
Merge branch '7/30'
|
6 years ago |
|
yuan
|
50a5858aa6
|
Merge branch '7/30' into develop
|
6 years ago |
|
yuan
|
918f20359d
|
fix html
|
6 years ago |
|
eason
|
57fc6a1ac1
|
fix wechat sign
|
6 years ago |
|
yuan
|
655acd41e3
|
fix html
|
6 years ago |
|
yuan
|
b44cca66dd
|
Merge branch '7/30' into develop
|
6 years ago |
|
yuan
|
968ce024e7
|
fix html
|
6 years ago |
|
kira
|
7cea42ba44
|
update
|
6 years ago |
|
kira
|
06967690b9
|
fixbug
|
6 years ago |
|
kira
|
568e54467f
|
update
|
6 years ago |
|
kira
|
65741a145d
|
update
|
6 years ago |
|
kira
|
08710164fe
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
21673b0b06
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
0bb2c9212a
|
update
|
6 years ago |
|
eason
|
6b160eab43
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
eason
|
a525310a58
|
fix
|
6 years ago |
|
eason
|
ec3fa5efbb
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
eason
|
78815a61e9
|
fix managers management
|
6 years ago |
|
kira
|
95082e96a3
|
update
|
6 years ago |
|
kira
|
7993e3f2c8
|
update
|
6 years ago |
|
kira
|
a316350c3f
|
update
|
6 years ago |
|
kira
|
1629c60a50
|
update
|
6 years ago |
|
kira
|
aa70bf4d41
|
update
|
6 years ago |
|
kira
|
747156ec28
|
update
|
6 years ago |
|
kira
|
f89ae4b174
|
update
|
6 years ago |
|
kira
|
f3bfd0e7db
|
update
|
6 years ago |
|
kira
|
698c1086c9
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
yuan
|
f3096930e2
|
fix html
|
6 years ago |
|
kira
|
a0065f056a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
3e823958fa
|
update
|
6 years ago |
|
eason
|
c3a56a4ea3
|
wechat_institution_merchant_id sql
|
6 years ago |
|
kira
|
1fce5a3dc2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
77567eaaf9
|
update
|
6 years ago |
|
kira
|
5fc1275493
|
add custom
|
6 years ago |
|
yuan
|
f114f89dd2
|
fix html
|
6 years ago |
|
kira
|
981459d0bb
|
update
|
6 years ago |
|
yuan
|
886f5d8ef5
|
Merge branch '7_30' into develop
|
6 years ago |
|
yuan
|
07b0241aed
|
fix bug
|
6 years ago |
|
yuan
|
24191f31db
|
fix html
|
6 years ago |
|
eason
|
61884d34fc
|
Merge branch 'hotfix_manager_service' into develop
|
6 years ago |
|
eason
|
2e557f5f15
|
Merge branch 'master' into hotfix_manager_service
|
6 years ago |
|
eason
|
97adc2cf7a
|
fix
|
6 years ago |
|
eason
|
2c9c0a1840
|
Merge branch 'hotfix_manager_service' into develop
|
6 years ago |
|
eason
|
61508fbc4a
|
Merge branch 'hotfix_manager_service'
|
6 years ago |
|
eason
|
0fec07172c
|
fix service role show
|
6 years ago |
|
kira
|
bfad3255f4
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
98f2a2501e
|
update method name
|
6 years ago |
|
kira
|
00e9c8b7da
|
tmp
|
6 years ago |
|
kira
|
7ae106869f
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
d12c2d1c35
|
refund list add currency
|
6 years ago |
|
kira
|
18fc6be9a4
|
tmp
|
6 years ago |
|
eason
|
a586964fa5
|
Merge branch 'develop'
|
6 years ago |
|
eason
|
f2232c6970
|
Merge branch 'hot1'
|
6 years ago |
|
yixian
|
ee1568cb7a
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
02687a1263
|
split bank in download xlsx
|
6 years ago |
|
eason
|
93137aae5e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
2c87ffffcb
|
Merge branch 'hot1' into develop
|
6 years ago |
|
eason
|
278d362b05
|
fix new customers
|
6 years ago |
|
kira
|
448aa422f0
|
update
|
6 years ago |
|
kira
|
ffd560352a
|
update
|
6 years ago |
|
kira
|
56ca5abb6c
|
update
|
6 years ago |
|
kira
|
95458bc4fc
|
update
|
6 years ago |
|
kira
|
63acb207d7
|
update
|
6 years ago |
|
kira
|
921d9b9803
|
add log
|
6 years ago |
|
kira
|
7610d01682
|
modify openim appkey & secret
|
6 years ago |
|
kira
|
46cd2a2bdd
|
update
|
6 years ago |
|
kira
|
70d8160871
|
update
|
6 years ago |
|
kira
|
1305007264
|
update
|
6 years ago |
|
kira
|
78a1455350
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
e1028366f0
|
update
|
6 years ago |
|
eason
|
d1a0ed322b
|
fix google map key
|
6 years ago |
|
eason
|
fc0e622c2b
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
eason
|
19b1425aff
|
fix
|
6 years ago |
|
kira
|
58cf4e0fe0
|
update
|
6 years ago |
|
eason
|
b9398f2cfa
|
fix google map key
|
6 years ago |
|
kira
|
3b6609ad03
|
update
|
6 years ago |
|
kira
|
d6a91a1c03
|
remove log
|
6 years ago |
|
kira
|
f2632b9c43
|
update customer service headimg
|
6 years ago |
|
kira
|
2991b9ca03
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
dab1dbf73e
|
重构
|
6 years ago |
|
kira
|
1a73f48808
|
重构
|
6 years ago |
|
eason
|
3e082165ff
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
abb86b3c3a
|
Merge branch 'h1' into develop
|
6 years ago |
|
eason
|
4f46380949
|
fix excel remark
|
6 years ago |
|
kira
|
5c19193c78
|
fixbug
|
6 years ago |
|
kira
|
016f5f94b1
|
update
|
6 years ago |
|
yixian
|
b7736f3318
|
split bank in download xlsx
|
6 years ago |
|
kira
|
4948539479
|
tmp
|
6 years ago |
|
kira
|
47549c0a9d
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
8b688159f6
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
7589d920a8
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
ef4752ef1a
|
remove Tommy mail adddress
|
6 years ago |
|
kira
|
cc623b1a21
|
update
|
6 years ago |
|
yixian
|
dd66355486
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
36ec9d4b6b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
6325331f62
|
Merge branch 'hotfix_multibank' into develop
|
6 years ago |
|
yixian
|
de1c415a2d
|
split bank in download xlsx
|
6 years ago |
|
kira
|
64fea0ebfe
|
update
|
6 years ago |
|
kira
|
2456a8a6bb
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
0200731725
|
add test
|
6 years ago |
|
kira
|
8d3c0d5987
|
add timer task
|
6 years ago |
|
kira
|
de7b91a0eb
|
add wx msg
|
6 years ago |
|
yuan
|
f60eb253a6
|
Merge branch '7/23' into develop
|
6 years ago |
|
yuan
|
8e13ac7452
|
fix html
|
6 years ago |
|
yuan
|
2d3d56bbb1
|
Merge branch '7/23' into develop
|
6 years ago |
|
yuan
|
12a510e30e
|
fix html
|
6 years ago |
|
kira
|
791ec028fe
|
udpate
|
6 years ago |
|
kira
|
bd7459810a
|
update
|
6 years ago |
|
kira
|
35ff5437c0
|
update
|
6 years ago |
|
kira
|
a0e0827bc4
|
update
|
6 years ago |
|
kira
|
89d1d26a4a
|
update
|
6 years ago |
|
kira
|
e472c81f5e
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
1bab9c4423
|
add openim application
|
6 years ago |
|
eason
|
27f5898810
|
Merge branch 'hotfix11' into develop
|
6 years ago |
|
eason
|
1050937afc
|
fix hf channel show
|
6 years ago |
|
eason
|
8ce50ccc36
|
Merge branch 'fix1' into develop
|
6 years ago |
|
eason
|
76f0cec66d
|
fix transaction
|
6 years ago |
|
kira
|
fde8a601ea
|
add customer servant config
|
6 years ago |
|
kira
|
c658495834
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
92a9e2a1ca
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
6 years ago |
|
kira
|
a3bf49708c
|
fixbug encourage money
|
6 years ago |
|
kira
|
cc766351ad
|
add customer service
|
6 years ago |
|
eason
|
f7c0f165cd
|
fix encourage css
|
6 years ago |
|
eason
|
9999f0de43
|
fix 自定义商户费率
|
6 years ago |
|
kira
|
405fdda8d2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
9e0ec85b81
|
Merge branch 'refundList' into develop
# 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
|
6 years ago |
|
kira
|
43abd4d5b1
|
add pos refund list
|
6 years ago |
|
kira
|
d0df62162f
|
customer tmp
|
6 years ago |
|
eason
|
29cf97ad89
|
fix encourage
|
6 years ago |
|
kira
|
8579b406d3
|
update
|
6 years ago |
|
yuan
|
7d24d1d063
|
fix bug
|
6 years ago |
|
yuan
|
6e2e5f2335
|
fix html
|
6 years ago |
|
yuan
|
5e812e933f
|
fix attention merchants
|
6 years ago |
|
yuan
|
20f15d7c64
|
fix Accounts
|
6 years ago |
|
kira
|
87bae39ecc
|
add
|
6 years ago |
|
kira
|
a6245606a5
|
tmp
|
6 years ago |
|
kira
|
79cfa5085f
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
6cf637bfec
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
10bef3722d
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
caef37d544
|
Merge branch 'hotfix'
|
6 years ago |
|
kira
|
3e2a90f4c6
|
update
|
6 years ago |
|
eason
|
b2e5d7dff6
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
eason
|
5ef0ca18fe
|
fix
|
6 years ago |
|
kira
|
53cbcc816f
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d952777873
|
update
|
6 years ago |
|
kira
|
f3e074bb6b
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
1cceedf15a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
788ea75b1b
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d444c33349
|
update
|
6 years ago |
|
luoyang14z7
|
5695e312f0
|
fix : AliForExcel
|
6 years ago |
|
luoyang14z7
|
5b5085d410
|
fix : AliForExcel
|
6 years ago |
|
kira
|
f060e2fcd3
|
update
|
6 years ago |
|
kira
|
bedba86e89
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
kira
|
f52f59f4c6
|
update
|
6 years ago |
|
kira
|
e95d595528
|
update
|
6 years ago |
|
kira
|
7c99d32b14
|
update
|
6 years ago |
|
kira
|
5948cdaa9c
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
1cf58228e6
|
update
|
6 years ago |
|
kira
|
6d2662ded7
|
tmp
|
6 years ago |
|
kira
|
4c97b2cc8a
|
Merge branch 'develop_openim' into develop
# Conflicts:
# src/main/ui/manage.html
|
6 years ago |
|
kira
|
f4ffe14bfa
|
udpate
|
6 years ago |
|
kira
|
58ade45bca
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
26e0a05699
|
update encourage money desc
|
6 years ago |
|
kira
|
73ad418728
|
add customer service
|
6 years ago |
|
kira
|
ecfda6a9ad
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
|
6 years ago |
|
kira
|
dce6f0e180
|
update img
|
6 years ago |
|
kira
|
4569c155e0
|
add default img
|
6 years ago |
|
kira
|
bb45fc0483
|
update encourage money head img
|
6 years ago |
|
eason
|
3696f360b5
|
Merge branch 'hotfix1' into develop
|
6 years ago |
|
eason
|
b4123e7f3f
|
fix encourage
|
6 years ago |
|
eason
|
0bf42064df
|
fix encourage
|
6 years ago |
|
eason
|
f8df5a6079
|
fix encourage
|
6 years ago |
|
eason
|
f133e71894
|
fix encourage
|
6 years ago |
|
eason
|
dd058ce25a
|
Merge branch 'hotfix1' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
6 years ago |
|
eason
|
e7f96bcabb
|
encourage
|
6 years ago |
|
eason
|
1f188598a6
|
encourage
|
6 years ago |
|
eason
|
a59789984e
|
encourage log
|
6 years ago |
|
eason
|
cbc766d441
|
encourage log
|
6 years ago |
|
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 |
