eason.qian
|
f0ade8c924
|
fix
|
7 years ago |
|
eason.qian
|
8ccbbe6e61
|
fix
|
7 years ago |
yuan
|
8f363f5c07
|
增加查看mondelay活动记录表
|
7 years ago |
wangning
|
332a2e6884
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
df4c8f90d0
|
fix
|
7 years ago |
|
wangning
|
f26f218a18
|
Merge branch 'notice' into develop
|
7 years ago |
|
wangning
|
69708125bf
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
0ec7bc27c0
|
update
|
7 years ago |
|
eason.qian
|
187298aad8
|
fix
|
7 years ago |
|
wangning
|
1d0100a4c9
|
update
|
7 years ago |
|
wangning
|
d84064a62b
|
fixbug tax_amount
|
7 years ago |
|
wangning
|
a40c046e41
|
fixbug
|
7 years ago |
|
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e4018d4939
|
update manual settle
|
7 years ago |
yixian
|
8a161c904f
|
Merge branch 'hotfix20180322manualsettle' into develop
|
7 years ago |
|
yixian
|
3388f19b31
|
manual settle
|
7 years ago |
|
yuan
|
7850e9e36c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
ed6aa9c00c
|
fix bug
|
7 years ago |
|
wangning
|
ce1da924fd
|
update
|
7 years ago |
|
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
wangning
|
ba5174fda7
|
update
|
7 years ago |
|
wangning
|
24510cf6e6
|
tmp
|
7 years ago |
|
eason.qian
|
1efd1b604a
|
fix
|
7 years ago |
|
yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
yuan
|
3545b72406
|
add cancle_waring msg
|
7 years ago |
|
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
|
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
|
eason.qian
|
92646432d5
|
fix
|
7 years ago |
|
yixian
|
0e826d98d2
|
rule update
|
7 years ago |
|
yixian
|
211da4f69e
|
rule update
|
7 years ago |
|
yixian
|
d47830f7f9
|
find settle to
|
7 years ago |
|
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
|
eason.qian
|
777a8c314e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
34605db062
|
fix
|
7 years ago |
|
wangning
|
55c7a93439
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
beefaeccc0
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7afbb7479f
|
fixbug
|
7 years ago |
|
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2287468292
|
fix
|
7 years ago |
|
wangning
|
e5a6813c91
|
update
|
7 years ago |
|
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
daee2f1a2e
|
update QR board
|
7 years ago |
|
yuan
|
3714c814c3
|
modify html
|
7 years ago |
|
wangning
|
cd60d89c40
|
unread interface add column msg_interval
|
7 years ago |
|
wangning
|
30d1c708f8
|
Partner Settlements Logs
|
7 years ago |
|
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7e35483150
|
update
|
7 years ago |
|
eason.qian
|
d5097ff363
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0667724269
|
mu
|
7 years ago |
|
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
|
yuan
|
8f14cb47a2
|
update
|
7 years ago |
|
yixian
|
c011802240
|
scale
|
7 years ago |
|
yixian
|
ba6e50ab5c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
yixian
|
041746ef4e
|
scale
|
7 years ago |
|
eason.qian
|
3cbdaf0339
|
fix cache bug~
|
7 years ago |
|
wangning
|
558c9fd771
|
update
|
7 years ago |
|
wangning
|
a5608059ea
|
update
|
7 years ago |
|
wangning
|
0fea884bd1
|
update
|
7 years ago |
|
wangning
|
d41232822f
|
update
|
7 years ago |
|
wangning
|
f6d92dde3a
|
update
|
7 years ago |
|
wangning
|
9bd674275f
|
update
|
7 years ago |
|
wangning
|
f14dbf84ae
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
91bba5dea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
10bb3b1404
|
fix
|
7 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
|
wangning
|
69104c110c
|
update
|
7 years ago |
|
wangning
|
674235960d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
bf8b17a5dc
|
Merge branch 'master_rate_cache' into develop
|
7 years ago |
|
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
|
eason.qian
|
373f024a57
|
fix
|
7 years ago |
|
eason.qian
|
d3d4b633fb
|
fix
|
7 years ago |
|
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
yixian
|
3f513ead4e
|
Merge branch 'manualsettle' into develop
|
7 years ago |
|
yixian
|
f11ccbc7cd
|
details
|
7 years ago |
|
wangning
|
a2b36ec297
|
update
|
7 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
|
yixian
|
69ecf574bd
|
Merge branch 'manualsettle' into develop
|
7 years ago |
|
yixian
|
4c6fbed61c
|
client
|
7 years ago |
|
yixian
|
241586966d
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
de40d0d0ea
|
manual settle request
|
7 years ago |
|
eason.qian
|
f1049e7cd9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
18db21c9f6
|
fix
|
7 years ago |
|
wangning
|
0a87728a96
|
update
|
7 years ago |
|
yuan
|
41bdbdfe3c
|
fix bug
|
7 years ago |
|
wangning
|
4d2a27c2ca
|
update
|
7 years ago |
|
wangning
|
caadaa605d
|
update
|
7 years ago |
|
wangning
|
1b462fd599
|
update
|
7 years ago |
|
wangning
|
9981c2b36f
|
add acts log
|
7 years ago |
|
wangning
|
b6daea5821
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
yuan
|
c6ba497390
|
活动管理增加字段
|
7 years ago |
|
wangning
|
fbec5fbd56
|
update
|
7 years ago |
Tayl0r
|
dd90c988fb
|
[Y] 翼支付清算日期
|
7 years ago |
|
eason.qian
|
2c313cbf65
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
4a78305160
|
fix
|
7 years ago |
|
wangning
|
176b69d685
|
update
|
7 years ago |
|
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
7 years ago |
|
yuan
|
bc82d0f6b7
|
fix html
|
7 years ago |
|
yuan
|
432067e046
|
fix~
|
7 years ago |
|
yuan
|
92be3cf81a
|
fix html
|
7 years ago |
|
wangning
|
7ea1050366
|
update
|
7 years ago |
|
wangning
|
7171a225d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e319db47ef
|
unread add act info
|
7 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
|
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
808e0b0be5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
febc6bc5b1
|
adjust merchant QR code
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
yuan
|
19ebddcfe2
|
fix bug
|
7 years ago |
|
Tayl0r
|
a82412eae7
|
Revert "[Y] 暂时关闭活动"
This reverts commit 021386f
|
7 years ago |
|
Tayl0r
|
021386fd5c
|
[Y] 暂时关闭活动
|
7 years ago |
|
yixian
|
28933de278
|
代码优化
|
7 years ago |
|
eason.qian
|
1c3ace6ffd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
yuan
|
6dbad697c4
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
wangning
|
43ed9074c1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1f112c19f7
|
fixbug
|
7 years ago |
|
eason.qian
|
6125d8b0f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
wangning
|
9bc84b33a8
|
fixbug
|
7 years ago |
|
yuan
|
9ffb7c4bd1
|
显示规则
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
7 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
yuan
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
b7459efc5b
|
fix
|
7 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
7 years ago |
|
eason.qian
|
a887493153
|
fix
|
7 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
wangning
|
6c201c3e18
|
rollbakc conrtract
|
7 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
wangning
|
e99dbd910a
|
update
|
7 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
7 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
7 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
|
yuan
|
2bc68b8456
|
fix~
|
7 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
