zhengyongxing
|
71826be2cc
|
汇总bug修正
|
4 years ago |
郑永星
|
0fd8c71af0
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
ba74305974
|
汇总bug修正
|
4 years ago |
|
郑永星
|
ed4297cb71
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
c711ef4b92
|
汇总bug修正
|
4 years ago |
|
郑永星
|
61d69eab60
|
Merge branch 'feature/add_item' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
f1308fce73
|
汇总bug修正
|
4 years ago |
|
郑永星
|
b69bc8ef6a
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
3f78880f7d
|
汇总bug修正
|
4 years ago |
 ELF
|
2ff1fc0041
|
修改
|
4 years ago |
|
ELF
|
55466e44ee
|
修改
|
4 years ago |
|
ELF
|
dec6c4b222
|
修改权限
|
4 years ago |
|
zyx
|
a2d68a2752
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
4a7915ef69
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
d42cd15b0b
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
041006e1b4
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
2c5889cd50
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c692e51fa7
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
52f4cbacb9
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
178c86a751
|
撤销汇总添加退回审核状态
|
4 years ago |
|
zhengyongxing
|
56593d5ee8
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
dc5a65903b
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
ef0c4427ce
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
4210bb7bf0
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
b4bdcd24fc
|
汇总bug流程修正
|
4 years ago |
|
zhengyongxing
|
e153fb66ca
|
聚合重新汇总bug修正
|
4 years ago |
万盟天下
|
9db2434d10
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
|
4 years ago |
|
zhengyongxing
|
2b4ed15a30
|
聚合公司绑定流程优化
|
4 years ago |
|
郑永星
|
8b9c732f6a
|
Merge branch 'feature/add_item' of wmtx/platform into master
审核拒绝bug修正
|
4 years ago |
|
zhengyongxing
|
7d3c8ebd61
|
审核拒绝bug修正
|
4 years ago |
|
万盟天下
|
1cb13ebb4c
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a2b085562d
|
聚合汇总bug修正
|
4 years ago |
|
郑永星
|
4f9c672aa1
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
|
4 years ago |
|
zhengyongxing
|
a977cf5f31
|
聚合公司绑定修正
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
郑永星
|
2c8c246d31
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
|
4 years ago |
|
zhengyongxing
|
6b486331b5
|
汇总权限测试
|
4 years ago |
|
郑永星
|
66af352eb8
|
Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
|
4 years ago |
|
zhengyongxing
|
f4f822d31a
|
公司绑定修正
|
4 years ago |
|
郑永星
|
07e877af4b
|
Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
|
4 years ago |
|
zhengyongxing
|
f757c10c61
|
绑定公司修正
|
4 years ago |
|
郑永星
|
a825f4757a
|
Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
0ebaf6ed64
|
小bug修改
|
4 years ago |
|
郑永星
|
e593db626c
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
4 years ago |
chenzhi
|
12e8500ce3
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
|
zhengyongxing
|
465f095dc4
|
市场业绩bug修正
|
4 years ago |
|
chenzhi
|
7a8b91c8f0
|
优化下游同游戏判断
|
4 years ago |
|
zhengyongxing
|
7a021dced5
|
市场业绩提示语修正
|
4 years ago |
|
zhengyongxing
|
15ad0a902b
|
Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
dab8251c11
|
Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
Conflicts:
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Data/update.sql
|
4 years ago |
|
万盟天下
|
9209c4fe38
|
Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
|
4 years ago |
|
ELF
|
24fe97186e
|
修改
|
4 years ago |
|
chenzhi
|
c40e366a03
|
优化删除游戏报错bug
|
4 years ago |
|
chenzhi
|
02aa1bd088
|
优化1
|
4 years ago |
|
zhengyongxing
|
c9516b8751
|
未汇总汇总功能提交
|
4 years ago |
|
zhengyongxing
|
4b44356a6d
|
Revert "优化下游个人同游戏判断"
This reverts commit f22dc90e
|
4 years ago |
|
chenzhi
|
f22dc90e96
|
优化下游个人同游戏判断
|
4 years ago |
|
zhengyongxing
|
2cdc4e815b
|
下游公司cp比例修改
|
4 years ago |
|
zhengyongxing
|
28f73f3140
|
公司比例格式修改
|
4 years ago |
|
chenzhi
|
3ef485516f
|
优化工会游戏修改
|
4 years ago |
|
zhengyongxing
|
c366fcfe4e
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
825d4e51c9
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
4e9bde9c10
|
汇总编辑提交
|
4 years ago |
|
zhengyongxing
|
9a6bc50eca
|
聚合公司绑定编辑修改
|
4 years ago |
|
zhengyongxing
|
d937dbad55
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
31568dd37c
|
聚合公司汇总编辑功能添加
|
4 years ago |
|
zhengyongxing
|
14ad9ce93d
|
聚合公司绑定功能及汇总提示语添加
|
4 years ago |
|
zhengyongxing
|
4cf512779a
|
聚合公司绑定功能及汇总提示语添加
|
4 years ago |
|
zhengyongxing
|
868889fe54
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
bc627cf224
|
汇总导出bug修改
|
4 years ago |
|
ELF
|
ad34536256
|
修改
|
4 years ago |
|
zhengyongxing
|
895b32cee8
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
60210fedef
|
撤销汇总名词修改
|
4 years ago |
|
zhengyongxing
|
fedcbd605b
|
bug修改
|
4 years ago |
|
ELF
|
6fcaa1362c
|
重置权限缓存
|
4 years ago |
|
zhengyongxing
|
518c902b2a
|
发起汇总修正
|
4 years ago |
|
zhengyongxing
|
ceef36a7d1
|
内部公司功能完善
|
4 years ago |
|
zhengyongxing
|
ab9be65422
|
内部公司功能提交
|
4 years ago |
|
zhengyongxing
|
0631c22c93
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
f95b593455
|
Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
# Application/Base/Tool/AggregateClient.class.php
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
400a9b3ded
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
4 years ago |
|
chenzhi
|
97af14147e
|
优化下游个人结算
|
4 years ago |
|
万盟天下
|
f52cf8947a
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏生成多条及内充也计入
|
4 years ago |
|
zhengyongxing
|
cdb02aa821
|
补点游戏生成多条及内充也计入
|
4 years ago |
|
郑永星
|
77e8161159
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
c5e272fb36
|
删除功能修正
|
4 years ago |
|
chenzhi
|
f169d65c1c
|
优化推广公司添加排序
|
4 years ago |
|
chenzhi
|
4a3cb6f6bb
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
zhengyongxing
|
a5090c3793
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
|
4 years ago |
|
zhengyongxing
|
7ef0f125c1
|
特殊补点删除功能提交
|
4 years ago |
|
zhengyongxing
|
47e373639d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
|
4 years ago |
|
郑永星
|
c7ba3e3ba3
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点bug修正
|
4 years ago |
|
zhengyongxing
|
ab7ae80634
|
补点bug修正
|
4 years ago |
|
郑永星
|
2e4904861b
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
特殊补点功能bug修正
|
4 years ago |
|
zhengyongxing
|
65dc1dec9e
|
特殊补点功能bug修正
|
4 years ago |
|
chenzhi
|
7a135f1019
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
廖金灵
|
5e2c093ea4
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
|
4 years ago |
|
郑永星
|
b65b8c6b2f
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
判定是否录入过修正
|
4 years ago |
|
zhengyongxing
|
229d8d2a50
|
判定是否录入过修正
|
4 years ago |
|
郑永星
|
a80f68ef5e
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点比例非负数修正
|
4 years ago |
|
zhengyongxing
|
df3b058b91
|
补点比例非负数修正
|
4 years ago |
|
廖金灵
|
9a2630093a
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
|
4 years ago |
|
郑永星
|
98563b686d
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
c7af3bdb1d
|
补点功能修正
|
4 years ago |
|
chenzhi
|
bcdbb3d0a0
|
优化导出保留两位小数
|
4 years ago |
|
zhengyongxing
|
c0406a6f52
|
上游导出修正
|
4 years ago |
|
chenzhi
|
e085b6cc78
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
f73a9033b3
|
新增下游个人比例
|
4 years ago |
|
廖金灵
|
1b9aa5c87e
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏有流水的就给予展示
|
4 years ago |
|
zhengyongxing
|
af5878a98f
|
补点游戏有流水的就给予展示
|
4 years ago |
|
廖金灵
|
de3477dd27
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
b39629fe08
|
补点功能修正
|
4 years ago |
|
郑永星
|
223c3a63f2
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
支付渠道优化
|
4 years ago |
|
zhengyongxing
|
64e2517b93
|
支付渠道优化
|
4 years ago |
|
chenzhi
|
329c5696d6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
4 years ago |
|
郑永星
|
c9497ee3f3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
|
4 years ago |
|
zhengyongxing
|
3adf8a93f8
|
比例格式修正
|
4 years ago |
|
chenzhi
|
e10b27a067
|
优化下游内团江息网络归属
|
4 years ago |
|
万盟天下
|
956d6c35a7
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
万盟天下
|
9d6b18009a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
4bb7015e1b
|
测试
|
4 years ago |
|
万盟天下
|
25c06c4b2d
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改功能
|
4 years ago |
|
万盟天下
|
eb7346c4a9
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
权限优化
|
4 years ago |
|
ELF
|
f37f6c51dd
|
修改功能
|
4 years ago |
|
chenzhi
|
2ff538886c
|
优化上游结算
|
4 years ago |
|
郑永星
|
700841fe7f
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
chenzhi
|
75c7b635b6
|
优化上游结算检索
|
4 years ago |
|
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
郑永星
|
7a9a12f99c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点无法重算限制
|
4 years ago |
|
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
4 years ago |
|
郑永星
|
c4ea44c3f8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点权限
|
4 years ago |
|
廖金灵
|
ef5c95f49a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
廖金灵
|
548c76bd99
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
ELF
|
1b949af7f5
|
优化
|
4 years ago |
|
廖金灵
|
cf821ae447
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
|
4 years ago |
|
zhengyongxing
|
ba80668560
|
特殊补点权限
|
4 years ago |
|
chenzhi
|
9c11344906
|
优化下游推广公司导出
|
4 years ago |
|
郑永星
|
3310553654
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
|
4 years ago |
|
zhengyongxing
|
1c08d1a221
|
比例格式修正
|
4 years ago |
|
郑永星
|
10e50b4bec
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
|
4 years ago |
|
zhengyongxing
|
f18f3ce7e2
|
比例与日期格式修正
|
4 years ago |
陈志
|
0c696fd8a5
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
陈志
|
4813e28fec
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总说明
|
4 years ago |
|
郑永星
|
ff1117c0b7
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
5acd5197ae
|
小bug修改
|
4 years ago |
|
chenzhi
|
b899ff7af7
|
优化汇总说明
|
4 years ago |
|
ELF
|
bdc23b7d90
|
修改
|
4 years ago |
|
廖金灵
|
de9367618b
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
1fb2fa7e81
|
解决冲突
|
4 years ago |
|
ELF
|
8d98bd5a36
|
优化
|
4 years ago |
|
ELF
|
d123f7b779
|
优化
|
4 years ago |
|
廖金灵
|
6a78824b10
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
郑永星
|
e554d9c288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点加入下游结算中
|
4 years ago |
|
zhengyongxing
|
19c7f7db0d
|
特殊补点加入下游结算中
|
4 years ago |
|
郑永星
|
1aebf2b939
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
|
4 years ago |
|
zhengyongxing
|
eac0fc61c0
|
特殊补点分成金额功能修正
|
4 years ago |
|
ELF
|
268e084241
|
修改
|
4 years ago |
|
陈志
|
e1db5c9a47
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
|
4 years ago |
|
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
|
郑永星
|
7c5ec40288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
a29a8e43ff
|
特殊补点bug修正
|
4 years ago |
|
廖金灵
|
931c837d7e
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
9d67a4c842
|
优化
|
4 years ago |
|
郑永星
|
e3850d18f5
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
|
4 years ago |
|
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
|
chenzhi
|
8baab09004
|
优化备注
|
4 years ago |
|
陈志
|
aa2feb7e1e
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化海南结算
|
4 years ago |
|
chenzhi
|
927c5b8595
|
优化海南结算
|
4 years ago |
|
chenzhi
|
a3a3505894
|
新增官方渠道结算
|
4 years ago |
|
郑永星
|
9f0f9b7951
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
zhengyongxing
|
b14d2d197c
|
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
廖金灵
|
d29ec01ab6
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
b9779df6b1
|
修改
|
4 years ago |
|
廖金灵
|
429ded27b8
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
0ff1089682
|
修改
|
4 years ago |
|
廖金灵
|
c633109176
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
留存率不区分设备
|
4 years ago |
|
ELF
|
619e1de3f3
|
留存率不区分设备
|
4 years ago |
|
陈志
|
c1fbda369b
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化财务汇总测试收入
|
4 years ago |
|
廖金灵
|
7436e7c89d
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
|
4 years ago |
|
ELF
|
3c3222ad26
|
测试订单优化
|
4 years ago |
|
chenzhi
|
eb2cd7d50f
|
优化财务汇总测试收入
|
4 years ago |
|
陈志
|
d130e6cf6d
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人汇总导出异常
|
4 years ago |
|
chenzhi
|
f405faa924
|
优化个人汇总导出异常
|
4 years ago |
|
陈志
|
053d1de648
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人结算
|
4 years ago |
|
chenzhi
|
1a55fbce69
|
优化个人结算
|
4 years ago |
|
廖金灵
|
151fa30be5
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
|
4 years ago |
|
ELF
|
a18e4188bd
|
修改bug
|
4 years ago |
|
chenzhi
|
05f11648a0
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
郑永星
|
f0153776c3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例功能修正
|
4 years ago |
|
zhengyongxing
|
3b2ddded90
|
特殊比例功能修正
|
4 years ago |
|
廖金灵
|
c9b1326c42
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
6596e01a29
|
修改
|
4 years ago |
|
zhengyongxing
|
65532fc0ab
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
Conflicts:
Application/Admin/Controller/PromoteCompanyController.class.php
Application/Base/Tool/AggregateClient.class.php
|
4 years ago |
|
chenzhi
|
31af865a9f
|
优化线下打款确认
|
4 years ago |
|
郑永星
|
3bc318daf3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例申请功能提交
|
4 years ago |
|
zhengyongxing
|
418d5a6bda
|
特殊比例申请功能提交
|
4 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
廖金灵
|
d48e90e1db
|
Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
|
4 years ago |
|
廖金灵
|
3690b7d000
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
|
4 years ago |
|
zhengyongxing
|
23555f8d4d
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
0215082018
|
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
3022525c85
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
|
zhengyongxing
|
cd331f2c64
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
9234919180
|
优化导出
|
4 years ago |
|
chenzhi
|
6cb4ecb930
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
zhengyongxing
|
2c005d1996
|
特殊补点汇总功能修改
|
4 years ago |
|
chenzhi
|
c795e5de6c
|
优化下游个人汇总样式
|
4 years ago |
|
zhengyongxing
|
f4aeae340d
|
特殊补点功能修正
|
4 years ago |
|
zhengyongxing
|
73dff8839e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
|
陈志
|
8fbf101e88
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
|
4 years ago |
|
chenzhi
|
ce5a83e9bc
|
优化汇总导出错误
|
4 years ago |
|
zhengyongxing
|
50495e73ca
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
6103908d83
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementController.class.php
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
|
zhengyongxing
|
9265d7c9b6
|
上下游聚合打款信息修改
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
陈志
|
fbdab69c71
|
Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
|
4 years ago |
|
ELF
|
e0bbec0978
|
修改
|
4 years ago |
|
chenzhi
|
57b692cd67
|
优化上游添加错误
|
4 years ago |
|
chenzhi
|
180332ab87
|
优化下游未汇总导出
|
4 years ago |
|
ELF
|
ad2037408d
|
优化
|
4 years ago |
|
chenzhi
|
4a98c587fa
|
新增线下打款确认
|
4 years ago |
|
ELF
|
e441f030c0
|
优化
|
4 years ago |
|
ELF
|
e9038d7471
|
ss
|
4 years ago |
|
chenzhi
|
69cf42e895
|
新增线下确认打款
|
4 years ago |
|
ELF
|
9b88e97672
|
修改
|
4 years ago |
|
ELF
|
296e378501
|
修改
|
4 years ago |
|
ELF
|
e4854aca3a
|
修改
|
4 years ago |
|
chenzhi
|
e2d179acd8
|
新增线下打款
|
4 years ago |
|
zhengyongxing
|
9000533644
|
下游公司功能提交
|
4 years ago |
|
ELF
|
1a14ed8dc7
|
修改
|
4 years ago |
|
zhengyongxing
|
24e33ed8ba
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
chenzhi
|
b35d0a0e95
|
新增删除日志
|
4 years ago |
|
chenzhi
|
79468aa6f2
|
新增结算删除
|
4 years ago |
|
ELF
|
34a22d65bf
|
修改
|
4 years ago |
|
ELF
|
42547128d4
|
优化押金
|
4 years ago |
|
chenzhi
|
a18df8c6fb
|
优化下游个人多比例结算
|
4 years ago |
|
ELF
|
7adabb54f9
|
修改
|
4 years ago |
|
chenzhi
|
ed66facc8f
|
优化结算查看
|
4 years ago |
|
elf@home
|
c40fbf3870
|
新增游戏自动授权
|
4 years ago |
|
elf@home
|
50755b89c5
|
修改
|
4 years ago |
|
zyx
|
89801c1467
|
特殊补点功能完善
|
4 years ago |
|
zhengyongxing
|
e6bc6853aa
|
特殊补点结算功能添加
|
4 years ago |
|
ELF
|
cc6c5d4e74
|
修改
|
4 years ago |
|
chenzhi
|
ff19f3259f
|
优化下游公司多比例结算
|
4 years ago |
|
chenzhi
|
492d7a8f73
|
优化获取比例
|
4 years ago |
|
chenzhi
|
f5fb65e400
|
新增获取公司游戏比例
|
4 years ago |
|
chenzhi
|
8e2f07db38
|
优化系统任务注释
|
4 years ago |
|
chenzhi
|
4f70b89063
|
优化系统任务执行
|
4 years ago |
|
chenzhi
|
b88f2986bd
|
优化重算，兼容wind
|
4 years ago |
|
chenzhi
|
7ceafb1d42
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
62b566e8b8
|
优化地址填写
|
4 years ago |
|
chenzhi
|
f0e43df7c2
|
新增重算
|
4 years ago |
|
chenzhi
|
fb75494c64
|
新增系统执行命令方法
|
4 years ago |
|
ELF
|
0923006a20
|
修改
|
4 years ago |
|
廖金灵
|
35d34d1864
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
|
4 years ago |
|
ELF
|
c7390f4c2e
|
bug修复
|
4 years ago |
|
廖金灵
|
79af51d27b
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
|
4 years ago |
|
chenzhi
|
f5ad1a6d0c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
04ac1da1d7
|
优化公司控制会长游戏规则
|
4 years ago |
|
ELF
|
550da5cb37
|
测试
|
4 years ago |
|
chenzhi
|
e8eb963fc1
|
修正公司取消游戏推广员无效
|
4 years ago |
|
elf@home
|
f8f9046a87
|
提交
|
4 years ago |
|
chenzhi
|
3efc4daee6
|
优化跟随
|
4 years ago |
|
chenzhi
|
c137a10c8f
|
优化游戏数据跟随
|
4 years ago |
|
chenzhi
|
03341a7d9f
|
优化游戏资质展示
|
4 years ago |
|
chenzhi
|
6560047a11
|
yh
|
4 years ago |
|
chenzhi
|
e94c452f85
|
取消结算单的管理员审核
|
4 years ago |
|
zhengyongxing
|
250d2ac2c0
|
市场业绩毛利修改
|
4 years ago |
|
ELF
|
06c4d5f1f1
|
优化测试资源
|
4 years ago |
|
zhengyongxing
|
b5e49e850d
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
fbf6948367
|
优化推广员整合
|
4 years ago |
|
chenzhi
|
fc05c274c4
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
ELF
|
66bffbff99
|
吸怪
|
4 years ago |
|
ELF
|
fa90dc0bc8
|
修改
|
4 years ago |
|
chenzhi
|
2b2acf833c
|
优化重复添加
|
4 years ago |
|
chenzhi
|
7c2ada7e17
|
优化个人导出
|
4 years ago |
|
chenzhi
|
b74b5ecfad
|
优化下游结算与导出
|
4 years ago |
|
chenzhi
|
84a665a2ab
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
963802dc1c
|
优化下游个人结算
|
4 years ago |
|
chenzhi
|
c110284ad9
|
优化个人结算多会长
|
4 years ago |
|
ELF
|
c9cd377d4f
|
修改
|
4 years ago |
|
ELF
|
fa9d330603
|
修改
|
4 years ago |
|
廖金灵
|
db4fc9699c
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
|
4 years ago |
|
ELF
|
9c59ba06e2
|
修改
|
4 years ago |
|
zhengyongxing
|
62f4ce3362
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
0a136fbbde
|
优化结算页面时间显示
|
4 years ago |
|
chenzhi
|
0a049e0391
|
优化下游公司导出
|
4 years ago |
|
chenzhi
|
51778a2a73
|
优化下游公司导出及汇总
|
4 years ago |
|
ELF
|
3383b3d2d9
|
修改
|
4 years ago |
|
chenzhi
|
c1b5b2f716
|
优化上游导出公式
|
4 years ago |
|
chenzhi
|
d7a9663d46
|
优化上游不结算
|
4 years ago |
|
chenzhi
|
180e21be86
|
优化结算上游结算为一单
|
4 years ago |
|
zhengyongxing
|
8cc9bdb0c6
|
市场结算管理市场业绩公式修正
|
4 years ago |
|
chenzhi
|
b3813dad4a
|
优化公司单子为一单
|
4 years ago |
|
zhengyongxing
|
d5e7546c51
|
市场结算管理市场业绩公式修正
|
4 years ago |
|
chenzhi
|
ec7b333fa4
|
优化下游个人打款设置
|
4 years ago |
|
chenzhi
|
aa6faf7280
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/change_dabase_bank
|
4 years ago |
|
chenzhi
|
cd5c6e7202
|
删除数据库操作功能
|
4 years ago |
|
chenzhi
|
62f91bb0df
|
优化
|
4 years ago |
|
chenzhi
|
027b1f2c08
|
合并ma
|
4 years ago |
|
chenzhi
|
98f2711f86
|
合并mas
|
4 years ago |
|
chenzhi
|
ea7bafec91
|
优化下游重算
|
4 years ago |
|
chenzhi
|
7beaff1825
|
优化下游个人汇总查看
|
4 years ago |
|
chenzhi
|
95b464f636
|
取消公司读取会长阿里信息
|
4 years ago |
|
chenzhi
|
9b78b8b461
|
优化下游个人结算
|
4 years ago |
|
chenzhi
|
141951467c
|
优化个人重算用户bug
|
4 years ago |
|
zhengyongxing
|
ccca696de2
|
市场结算管理bug修正
|
4 years ago |
|
zhengyongxing
|
a140a4c9d5
|
市场结算管理bug修正
|
4 years ago |
|
ELF
|
49751b8760
|
测试资源修改
|
4 years ago |
chenzhi
|
88a129f06c
|
优化重算
|
4 years ago |
|
chenzhi
|
5db1f7ce24
|
优化比例显示
|
4 years ago |
|
zhengyongxing
|
bd9af09830
|
市场结算管理bug修正
|
4 years ago |
|
chenzhi
|
9ee69f9bd4
|
优化下游结算单导出
|
4 years ago |
|
chenzhi
|
07fd53a6aa
|
优化上游导出文件格式及时间问题
|
4 years ago |
|
zhengyongxing
|
c72d60b37d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
|
4 years ago |
|
zyx
|
223c69797c
|
平台币导出bug修正
|
4 years ago |
|
chenzhi
|
b2239380bf
|
优化负数结算规则
|
5 years ago |
|
chenzhi
|
978a42b4df
|
优化结算流水判定依旧平台流水
|
5 years ago |
|
chenzhi
|
7335f5da15
|
上下游非0都要结算
|
5 years ago |
|
chenzhi
|
ecf92c03a7
|
合并
|
5 years ago |
|
chenzhi
|
9b61a39620
|
优化游戏统计导出时间问题
|
5 years ago |
|
chenzhi
|
ba20c3683a
|
优化游戏统计时间
|
5 years ago |
|
陈志
|
97f79a9c0f
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
4c1a03b7c7
|
优化结算流水及汇总金额300判定
|
5 years ago |
|
廖金灵
|
194523f00f
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游cp结算比例问题
|
5 years ago |
|
chenzhi
|
ca7f92573b
|
优化上游cp结算比例问题
|
5 years ago |
|
廖金灵
|
a45b12ed3f
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
5 years ago |
|
ELF
|
672b276228
|
修改bug
|
5 years ago |
|
廖金灵
|
6145745a01
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改游戏统计
|
5 years ago |
|
ELF
|
b71c81d764
|
修改bug
|
5 years ago |
|
廖金灵
|
49365c790d
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游比例获取
|
5 years ago |
|
chenzhi
|
9d9eae85ec
|
优化上游比例获取
|
5 years ago |
|
chenzhi
|
47e57f48e6
|
优化审批文字错误
|
5 years ago |
|
廖金灵
|
7d676b406f
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游查看
|
5 years ago |
|
chenzhi
|
c57c40535b
|
优化下游查看
|
5 years ago |
|
廖金灵
|
5855973c67
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游结算为支付时间
|
5 years ago |
|
chenzhi
|
651aa6cc8b
|
优化参数不足
|
5 years ago |
|
chenzhi
|
071c8c78f4
|
优化下游结算为新增时间
|
5 years ago |
|
廖金灵
|
a36123059c
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化聚合渠道统计
|
5 years ago |
|
chenzhi
|
884f919387
|
优化聚合渠道统计
|
5 years ago |
|
廖金灵
|
a05770557b
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化汇总时间显示
|
5 years ago |
|
chenzhi
|
0fd5bc7fe8
|
优化汇总时间显示
|
5 years ago |
|
chenzhi
|
b9567f6faf
|
优化时间戳模式
|
5 years ago |
|
chenzhi
|
724fe9e60f
|
优化导出市场专员
|
5 years ago |
|
廖金灵
|
54f933aba1
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
5 years ago |
|
ELF
|
95672ffc90
|
修改bug
|
5 years ago |
|
廖金灵
|
637f22c22b
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
5 years ago |
|
ELF
|
8e40b43696
|
修改bug
|
5 years ago |
|
ELF
|
83a1d34b2c
|
修改bug
|
5 years ago |
|
廖金灵
|
3d36fbb00d
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
5 years ago |
|
ELF
|
7445125745
|
修改bug
|
5 years ago |
|
廖金灵
|
edae05c50e
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化结算
|
5 years ago |
|
chenzhi
|
f3b145f930
|
优化未结算查询
|
5 years ago |
|
chenzhi
|
f7581f3504
|
优化结算小于0依旧结算
|
5 years ago |
|
ELF
|
6ac8a0a9b3
|
修改bug
|
5 years ago |
|
ELF
|
0ee5ea3c02
|
修改bug
|
5 years ago |
|
chenzhi
|
71d0d2c9d1
|
优化个人显示支付方式
|
5 years ago |
|
ELF
|
7471dcf338
|
取消调试代码
|
5 years ago |
|
ELF
|
e34d28e2c8
|
修改
|
5 years ago |
|
chenzhi
|
3fc9b578a9
|
优化个人重算
|
5 years ago |
|
chenzhi
|
007ca52afa
|
优化个人比例获取方式
|
5 years ago |
|
chenzhi
|
9b32f0cd0e
|
优化获取cp比例
|
5 years ago |
|
廖金灵
|
406d1c47d4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
|
5 years ago |
|
zyx
|
9df721d1f5
|
平台币导出bug修正
|
5 years ago |
|
廖金灵
|
8c942dbcbc
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
|
5 years ago |
|
zyx
|
bbb7f3301c
|
平台币导出增加商户
|
5 years ago |
|
zyx
|
896cdd92b9
|
平台币增加商户
|
5 years ago |
|
廖金灵
|
20a2184521
|
Merge branch 'hotfix/platform_statistic_search' of wmtx/platform into master
统计搜索优化
|
5 years ago |
yulingwei
|
8d36e35271
|
upt
|
5 years ago |
|
廖金灵
|
1440856626
|
Merge branch 'hotfix/add_prompte_relation' of wmtx/platform into master
优化新增会长关系不跟随
|
5 years ago |
|
chenzhi
|
5f1afdef9f
|
优化新增会长关系不跟随
|
5 years ago |
|
廖金灵
|
0e878884bb
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场业绩bug修改，权限添加
|
5 years ago |
|
zhengyongxing
|
1bea859fd4
|
市场业绩bug修改，权限添加
|
5 years ago |
|
yulingwei
|
9cdab21db9
|
repair search
|
5 years ago |
|
廖金灵
|
79b0f3224d
|
Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改权限控制
|
5 years ago |
|
ELF
|
cbd3bc7362
|
修改
|
5 years ago |
|
廖金灵
|
32bdbbfc39
|
Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改session过期时间
|
5 years ago |
|
ELF
|
81a706e809
|
修改session过期时间
|
5 years ago |
|
陈志
|
890499ce59
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
52419ae22a
|
优化上游不结算金额
|
5 years ago |
|
chenzhi
|
b73e3fea84
|
优化财务汇总统计
|
5 years ago |
|
chenzhi
|
0c11ddb004
|
优化聚合数据
|
5 years ago |
|
chenzhi
|
98c8c7ee1e
|
优化测试服订单
|
5 years ago |
|
郑永星
|
c55b798bb4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
1f6c96e3a9
|
bug修改
|
5 years ago |
|
zhengyongxing
|
05d3ba9c23
|
财务汇总统计bug修改
|
5 years ago |
|
zhengyongxing
|
e67538fcef
|
财务汇总统计bug修改汇总统计修改
|
5 years ago |
|
zhengyongxing
|
c6570fee01
|
财务汇总统计bug修改汇总统计修改
|
5 years ago |
|
zhengyongxing
|
38da7f005d
|
汇总统计修改
|
5 years ago |
|
chenzhi
|
13efc01d3d
|
优化财务汇总
|
5 years ago |
|
chenzhi
|
f0d20598de
|
新增商户权限
|
5 years ago |
|
chenzhi
|
ef4702fb46
|
暂存
|
5 years ago |
|
郑永星
|
fe4a029ce4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
7aa031bbb4
|
市场结算管理优化
|
5 years ago |
|
chenzhi
|
3b3ed208e2
|
财务汇总新增测试订单收入
|
5 years ago |
|
chenzhi
|
837c09716d
|
财务汇总-支付时间
|
5 years ago |
|
廖金灵
|
37a84b8ce7
|
Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
|
5 years ago |
|
zhengyongxing
|
f9503182da
|
市场结算管理优化
|
5 years ago |
|
廖金灵
|
613b50eb63
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
5 years ago |
|
zhengyongxing
|
f18db12d69
|
支付渠道跳转增加
|
5 years ago |
|
廖金灵
|
c8af2d79ff
|
Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
|
5 years ago |
|
廖金灵
|
a2474aaa0b
|
Merge branch 'feature/reward' of wmtx/platform into release
修改时间
|
5 years ago |
|
yulingwei
|
b1a91339cb
|
Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
|
5 years ago |
|
yulingwei
|
1634f14fb2
|
upt
|
5 years ago |
|
yulingwei
|
a01beb9bc6
|
upt
|
5 years ago |
|
郑永星
|
f01030ffaa
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
d9d66dc5bf
|
支付渠道跳转增加
|
5 years ago |
|
陈志
|
575c074c39
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
b63369cdba
|
优化结算方式查询
|
5 years ago |
|
chenzhi
|
c6b3d1948e
|
优化打款剔除后显示
|
5 years ago |
|
廖金灵
|
697dad95c8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
5 years ago |
|
zhengyongxing
|
4c582e51c7
|
支付渠道跳转增加
|
5 years ago |
|
廖金灵
|
d6790fdf6c
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
|
5 years ago |
|
yulingwei
|
08400bd67a
|
upt
|
5 years ago |
|
廖金灵
|
86b8682d02
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
5 years ago |
|
zhengyongxing
|
0c4f1f05bd
|
支付渠道跳转增加
|
5 years ago |
|
廖金灵
|
fc7284de94
|
Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
|
5 years ago |
|
廖金灵
|
d73ab9c4cd
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
|
5 years ago |
|
陈志
|
f63985ece1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
|
5 years ago |
|
ELF
|
a4d4a51a2c
|
完善支付商户操作日志
|
5 years ago |
|
chenzhi
|
3318298d2e
|
优化上下游导出时间
|
5 years ago |
|
zhengyongxing
|
9a722d5b45
|
市场结算管理bug修改
|
5 years ago |
|
yulingwei
|
de0fc5e074
|
upt
|
5 years ago |
|
chenzhi
|
6f75b0e6d8
|
优化结算单无地址
|
5 years ago |
|
chenzhi
|
493197fed2
|
优化重新结算
|
5 years ago |
|
chenzhi
|
91510679b0
|
Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
|
5 years ago |
|
chenzhi
|
853c938edb
|
优化下游个人结算时间
|
5 years ago |
|
chenzhi
|
92ccc96dcd
|
优化下游公司结算时间审核
|
5 years ago |
|
chenzhi
|
a14f0abb88
|
上游新增结算时间判断
|
5 years ago |
|
廖金灵
|
57ea4efb72
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
|
5 years ago |
|
zhengyongxing
|
8c237e19fe
|
充值订单bug修改
|
5 years ago |
|
廖金灵
|
79f038d62a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
|
5 years ago |
|
zhengyongxing
|
24bcd381a0
|
支付商户bug修改
|
5 years ago |
|
chenzhi
|
0f284cf9b3
|
优化游戏绑定，已经绑定不出现
|
5 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
624a2b7cde
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
9a202a393e
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
5 years ago |
|
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
5 years ago |
|
廖金灵
|
7340d5b4fd
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
|
5 years ago |
|
zhengyongxing
|
45d124b4cd
|
手机号码重复验证
|
5 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
5 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
5 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
5 years ago |
|
廖金灵
|
9e3de695ca
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
|
5 years ago |
|
廖金灵
|
e4ab39bf64
|
Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
|
5 years ago |
|
廖金灵
|
54ad7191b1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
|
5 years ago |
|
廖金灵
|
2ea819c585
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
|
5 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
5 years ago |
|
ELF
|
ff47282287
|
修改
|
5 years ago |
|
chenzhi
|
5ef1aa6e22
|
新增防止并发请求数据
|
5 years ago |
|
ELF
|
e0f71b67c5
|
处理
|
5 years ago |
|
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
5 years ago |
|
陈志
|
d5c54234b3
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
e3022cb6c2
|
关闭测试验证码
|
5 years ago |
|
ELF
|
6f8b93a26b
|
修改
|
5 years ago |
|
zhengyongxing
|
11ff884e6a
|
Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/AggregateFinanceSetController.class.php
# Application/Admin/Controller/CpJuheCompanyController.class.php
# Application/Admin/View/CpJuheCompany/detail.html
# Application/Admin/View/CpJuheCompany/export.html
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
91178308f9
|
下游公司字段与上游公司字段一致
|
5 years ago |
|
陈志
|
e01c7e4e01
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
69615c1459
|
优化脚本执行
|
5 years ago |
|
chenzhi
|
0e8730b810
|
优化重算需重新确认
|
5 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
5 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
5 years ago |
|
ELF
|
fbe8d7a351
|
修改bug
|
5 years ago |
|
chenzhi
|
fe1853065a
|
优化结算原包名显示
|
5 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
5 years ago |
|
chenzhi
|
f4be3972b2
|
优化结算单确认
|
5 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
5 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
5 years ago |
|
chenzhi
|
47b54d336c
|
优化汇总撤回
|
5 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
5 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
5 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
5 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
5 years ago |
|
chenzhi
|
3ef8061e3e
|
优化个人0值重算
|
5 years ago |
|
chenzhi
|
6b9358c651
|
优化结算
|
5 years ago |
|
chenzhi
|
3cbc769bce
|
优化个人结算
|
5 years ago |
|
chenzhi
|
f70d8cb8a7
|
优化个人结算
|
5 years ago |
|
chenzhi
|
7f01c3ff39
|
优化上游结算方式
|
5 years ago |
|
chenzhi
|
f91b2a5dce
|
优化下游结算
|
5 years ago |
|
chenzhi
|
d946a4c91c
|
优化下游公司结算
|
5 years ago |
|
chenzhi
|
8e77f3ed4d
|
优化上游结算
|
5 years ago |
|
chenzhi
|
16a3bea172
|
优化上游新增服务器费用结算包名
|
5 years ago |
|
chenzhi
|
51c4b07eea
|
优化上游结算包名
|
5 years ago |
|
chenzhi
|
2de8e4a313
|
开启测试验证码
|
5 years ago |
|
chenzhi
|
b0034d5f19
|
优化推广公司游戏申请不审核
|
5 years ago |
|
chenzhi
|
a948986b41
|
优化上游导出
|
5 years ago |
|
chenzhi
|
5c857840a2
|
分成比例新增生效检索
|
5 years ago |
|
chenzhi
|
94a3057013
|
新增游戏分成比例导出
|
5 years ago |
|
chenzhi
|
ac65098827
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
|
5 years ago |
|
廖金灵
|
5f0917220c
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
|
5 years ago |
|
chenzhi
|
8e4541cb01
|
推广分成特殊申请
|
5 years ago |
|
廖金灵
|
c67cbc61c2
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
5 years ago |
|
chenzhi
|
0430293bb7
|
优化电话不限制
|
5 years ago |
|
廖金灵
|
4869d650d9
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正，导出格式修改
|
5 years ago |
|
zhengyongxing
|
815e2e3b88
|
时间格式修正，导出格式修改
|
5 years ago |
|
chenzhi
|
6024ae342c
|
优化顺序及导出
|
5 years ago |
|
chenzhi
|
8ded1f3169
|
优化游戏模板显示
|
5 years ago |
|
chenzhi
|
4460f8e7cf
|
新增结算包名
|
5 years ago |
|
廖金灵
|
a958f8c043
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址条件修改
|
5 years ago |
|
zhengyongxing
|
52fe6d04f8
|
聚合公司详情详细网址修改
|
5 years ago |
|
廖金灵
|
a70a494102
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址修改
|
5 years ago |
|
zhengyongxing
|
4325ed23ee
|
聚合公司详情详细网址修改
|
5 years ago |
|
chenzhi
|
3ff79ce6c1
|
优化公会检索
|
5 years ago |
|
chenzhi
|
832f531d20
|
优化审核通过
|
5 years ago |
|
廖金灵
|
b8532da607
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细地址格式修改
|
5 years ago |
|
zhengyongxing
|
5bbdfe7e74
|
聚合公司详情详细地址修改
|
5 years ago |
|
ELF
|
557f0203ac
|
解决冲突
|
5 years ago |
|
廖金灵
|
5d809ae9b8
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
|
5 years ago |
|
ELF
|
62d7f15fdc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
|
5 years ago |
|
chenzhi
|
0197743266
|
优化合同期限查询
|
5 years ago |
|
chenzhi
|
4dd8526e2b
|
优化日志
|
5 years ago |
|
chenzhi
|
3ad0d447d4
|
优化显示
|
5 years ago |
|
chenzhi
|
4501036ba8
|
优化导出错误
|
5 years ago |
|
chenzhi
|
069cc1599a
|
优化上游检索
|
5 years ago |
|
chenzhi
|
5a962e1b73
|
新增分成优化
|
5 years ago |
|
chenzhi
|
6181059faf
|
优化搜索
|
5 years ago |
|
chenzhi
|
945f033df5
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance
|
5 years ago |
|
chenzhi
|
61e6d8131c
|
新增支付宝真实名称只能是中文验证
|
5 years ago |
|
chenzhi
|
5894324ca8
|
旧数据脚本
|
5 years ago |
|
chenzhi
|
94cbae1924
|
优化打款提醒
|
5 years ago |
|
chenzhi
|
c733fc2e15
|
优化游戏删除
|
5 years ago |
|
chenzhi
|
d015bce440
|
优化推广下游查看
|
5 years ago |
|
chenzhi
|
80e8477b51
|
新增检索
|
5 years ago |
|
ELF
|
c127ea6139
|
修改bug
|
5 years ago |
|
ELF
|
546d83f4a3
|
修改bug
|
5 years ago |
|
ELF
|
bb8052614b
|
修改推广游戏分成市场专员权限控制
|
5 years ago |
|
chenzhi
|
a3f28b67a5
|
新增游戏搜索
|
5 years ago |
|
zhengyongxing
|
1fff2e6c09
|
财务代码搬到新的分支上
|
5 years ago |
|
zhengyongxing
|
2fe7c864df
|
聚合公司功能提交
|
5 years ago |
|
zhengyongxing
|
4c3112b70e
|
充值信息查看权限添加
|
5 years ago |
|
chenzhi
|
d91d8346b9
|
优化下游导出
|
5 years ago |
|
yulingwei
|
1c633e60cb
|
upt
|
5 years ago |
|
ELF
|
27ccee9b20
|
修改
|
5 years ago |
|
ELF
|
46fc13a91e
|
修改
|
5 years ago |
|
yulingwei
|
9a380d7756
|
upt
|
5 years ago |
|
ELF
|
1bec15c186
|
修改迁移bug
|
5 years ago |
|
chenzhi
|
8ac604be33
|
优化导出
|
5 years ago |
|
chenzhi
|
6bb398bcc3
|
优化下游显示
|
5 years ago |
|
yulingwei
|
7b9bb91e16
|
upt
|
5 years ago |
|
ELF
|
cefed5c559
|
修改
|
5 years ago |
|
zhengyongxing
|
1ff82cce20
|
聚合下游公司列表添加
|
5 years ago |
|
chenzhi
|
8c191c2f05
|
优化推广员公司列表
|
5 years ago |
|
chenzhi
|
5367ea4aae
|
优化前端
|
5 years ago |
|
ELF
|
f3b323bda8
|
修改
|
5 years ago |
|
yulingwei
|
0a9e7ed3ef
|
upt
|
5 years ago |
|
yulingwei
|
e789c941ed
|
upt
|
5 years ago |
|
yulingwei
|
7830cef93d
|
upt
|
5 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
5 years ago |
|
yulingwei
|
e0d74cbffd
|
upt
|
5 years ago |
|
chenzhi
|
1bc3dab93c
|
新增下游渠道比例
|
5 years ago |
|
yulingwei
|
066610f236
|
upt
|
5 years ago |
|
yulingwei
|
f373bd2025
|
upt
|
5 years ago |
|
yulingwei
|
deac7da5ff
|
upt
|
5 years ago |
|
yulingwei
|
25dec010be
|
upt
|
5 years ago |
|
yulingwei
|
eaa25ebcda
|
feature/desposit
|
5 years ago |
|
zhengyongxing
|
cacb1e4cf4
|
商户统计结算功能添加
|
5 years ago |
|
ELF
|
096e32d581
|
商户配置
|
5 years ago |
|
yulingwei
|
2fbea72d26
|
up
|
5 years ago |
|
chenzhi
|
afac0376be
|
新增下游审批
|
5 years ago |
|
chenzhi
|
7d404c6904
|
优化查看
|
5 years ago |
|
chenzhi
|
cafdc39f2a
|
优化添加
|
5 years ago |
|
zhengyongxing
|
cb0ceda1cb
|
聚合财务导出模板修正
|
5 years ago |
|
zhengyongxing
|
ee6be3b45b
|
市场业绩提成当流水不足起提流水时，税后毛利不予展示
|
5 years ago |
|
chenzhi
|
d662c89b7e
|
zancun
|
5 years ago |
|
zhengyongxing
|
960903a31c
|
新功能添加
|
5 years ago |
|
chenzhi
|
f731a417bd
|
优化工会关系
|
5 years ago |
|
chenzhi
|
d9d55a3bcb
|
优化新增下游公司
|
5 years ago |
|
zhengyongxing
|
729136a95c
|
聚合订单代码导出，及重算功能修改
|
5 years ago |
|
ELF
|
e8a925b64c
|
游戏统计添加聚合充值数据
|
5 years ago |
|
chenzhi
|
69adcbabf8
|
优化推广公司
|
5 years ago |
|
chenzhi
|
5aa7427504
|
新增公司信息编辑
|
5 years ago |
|
yulingwei
|
20ac65f12a
|
upt
|
5 years ago |
|
yulingwei
|
555fd052fe
|
upt
|
5 years ago |
|
chenzhi
|
35f2fe3f05
|
优化公司显示
|
5 years ago |
|
yulingwei
|
c8bd476a60
|
upt
|
5 years ago |
|
zhengyongxing
|
2fefd44d0c
|
公会统计推广员支付时间修正
|
5 years ago |
|
chenzhi
|
f7d90780aa
|
新增CP公司审核
|
5 years ago |
|
zhengyongxing
|
cd8f64c7e6
|
游戏详情订单修改
|
5 years ago |
|
chenzhi
|
33cf2cf8a6
|
新增审核列表
|
5 years ago |
|
yulingwei
|
33049f5a9f
|
upt
|
5 years ago |
|
ELF
|
05fac79ed3
|
修改
|
5 years ago |
|
chenzhi
|
0c2e2db65d
|
新增税费费率
|
5 years ago |
|
zhengyongxing
|
288f121955
|
添加手机登录的功能
|
5 years ago |
|
yulingwei
|
e155c92ed6
|
1
|
5 years ago |
|
zhengyongxing
|
114e51ebe2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
|
5 years ago |
|
chenzhi
|
58c8508ce4
|
新增cp导出
|
5 years ago |
|
chenzhi
|
bd3510581f
|
新增CP导出生效时间
|
5 years ago |
|
chenzhi
|
296b5a0d8f
|
优化关系函数
|
5 years ago |
|
chenzhi
|
3349304e10
|
新增上游预警金额读取
|
5 years ago |
|
ELF
|
c87b61d94b
|
修改发票类型
|
5 years ago |
|
ELF
|
b448f0829e
|
修改公司绑定默认值
|
5 years ago |
|
yulingwei
|
98413791aa
|
repair
|
5 years ago |
|
万盟天下
|
32d4450e4a
|
Merge branch 'featurn/markets' of wmtx/platform into master
名字增加修改
|
5 years ago |