 廖金灵
|
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 |
|
zhengyongxing
|
53f490ea20
|
名字增加修改
|
5 years ago |
|
万盟天下
|
00d99897b0
|
Merge branch 'hotfix/gitbag_op' of wmtx/platform into master
优化后台礼包
|
5 years ago |
|
ELF
|
007b7b5c1f
|
优化后台
|
5 years ago |
|
ELF
|
15d0b454a4
|
修改
|
5 years ago |
|
万盟天下
|
72115a9ede
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员统计修改
|
5 years ago |
|
yulingwei
|
64bb801be2
|
1
|
5 years ago |
|
yulingwei
|
6390d680ec
|
upt
|
5 years ago |
|
yulingwei
|
96327507f4
|
upt
|
5 years ago |
|
yulingwei
|
52b478f570
|
upt
|
5 years ago |
|
yulingwei
|
7fc6609d78
|
upt
|
5 years ago |
|
yulingwei
|
aa77fb7821
|
upt
|
5 years ago |
|
zhengyongxing
|
2220a6cfec
|
财务支付时间修改，增加手机登录验证，及开发推广员列表名称
|
5 years ago |
|
yulingwei
|
b9dfe08177
|
upt
|
5 years ago |
|
yulingwei
|
1119e8faf9
|
upt
|
5 years ago |
|
chenzhi
|
6c1f898fb9
|
优化换绑时间
|
5 years ago |
|
yulingwei
|
80597c4894
|
upt
|
5 years ago |
|
chenzhi
|
db64bea72f
|
优化提醒
|
5 years ago |
|
chenzhi
|
617cfbd4bf
|
优化换绑
|
5 years ago |
|
yulingwei
|
0b54c71cb0
|
upt
|
5 years ago |
|
chenzhi
|
d6ec8e0248
|
新增导出
|
5 years ago |
|
廖金灵
|
831c87c9ee
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
优化公会统计
|
5 years ago |
|
廖金灵
|
420c3454fc
|
Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
|
5 years ago |
|
廖金灵
|
3065ba060f
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
条数修改
|
5 years ago |
|
zhengyongxing
|
fd926a0795
|
条数修改
|
5 years ago |
郑永星
|
b77a3a1136
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
groupby市场专员id添加
|
5 years ago |
|
zhengyongxing
|
5ea0f21574
|
groupby市场专员id添加
|
5 years ago |
|
廖金灵
|
3095270a84
|
Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
|
5 years ago |
|
ELF
|
f167d63c4a
|
修改
|
5 years ago |
|
郑永星
|
8076e22b2f
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
ce2540919c
|
市场专员筛选
|
5 years ago |
|
郑永星
|
c036175a14
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员筛选，月份跳转，及时间筛选修正
|
5 years ago |
|
zhengyongxing
|
96f68c4f50
|
市场专员筛选，月份跳转，及时间筛选修正
|
5 years ago |
|
elf@home
|
fb87be0b43
|
修改
|
5 years ago |
|
廖金灵
|
83a1f15de5
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
|
5 years ago |
|
zhengyongxing
|
cd208fbfd7
|
跳转汇总结算单默认事件添加
|
5 years ago |
|
廖金灵
|
6f3a94a31b
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
|
5 years ago |
|
zhengyongxing
|
19c2f8b2de
|
跳转汇总结算单默认事件添加
|
5 years ago |
|
廖金灵
|
98dab102f4
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正，添加筛选发放状态的代码
|
5 years ago |
|
zhengyongxing
|
ced9d51845
|
跳转汇总结算单跳转修正，添加筛选发放状态的代码
|
5 years ago |
|
廖金灵
|
262940a42f
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员，其他人员的数据隐
|
5 years ago |
|
zhengyongxing
|
53979941a0
|
列表全部开发给市场专员，其他人员的数据隐藏
|
5 years ago |
|
廖金灵
|
1ec683a86e
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成市场总监管理组添加查看全部用户的权限
|
5 years ago |
|
zhengyongxing
|
1acef89380
|
市场业绩提成市场总监管理组添加查看全部用户的权限
|
5 years ago |
|
廖金灵
|
27f14f0292
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
|
5 years ago |
|
zhengyongxing
|
bded27756e
|
市场业绩提成bug修改
|
5 years ago |
|
廖金灵
|
6deed99b79
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
|
5 years ago |
|
zhengyongxing
|
5ab96edd8f
|
市场业绩提成bug修改
|
5 years ago |
|
廖金灵
|
b58f66f9b8
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
|
5 years ago |
|
zhengyongxing
|
5f113b8bfc
|
市场业绩提成优化
|
5 years ago |
|
廖金灵
|
886c70665c
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
|
5 years ago |
|
zhengyongxing
|
2975b9fe35
|
市场业绩提成优化
|
5 years ago |
|
廖金灵
|
31de395c6e
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
|
5 years ago |
|
zhengyongxing
|
cbb0e82db1
|
提现汇总表时间检索bug修正
|
5 years ago |
|
郑永星
|
a9e8905e27
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
|
5 years ago |
|
zhengyongxing
|
3eeeb449de
|
提现汇总表时间检索bug修正
|
5 years ago |
|
zhengyongxing
|
4e562ffcc4
|
提现汇总表时间检索bug修正
|
5 years ago |
|
廖金灵
|
8ad5533c53
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
汇率逻辑修改
|
5 years ago |
|
zhengyongxing
|
0ac831dece
|
汇率逻辑修改
|
5 years ago |
|
廖金灵
|
39af00fe0e
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
|
5 years ago |
|
ELF
|
2dadc11d09
|
修改bug
|
5 years ago |
|
廖金灵
|
578087e50e
|
Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
|
5 years ago |
|
ELF
|
fa4de7ece5
|
修改
|
5 years ago |
|
zhengyongxing
|
585f523984
|
arpu分析bug修正
|
5 years ago |
|
zhengyongxing
|
a6dd2a9830
|
市场专员业绩导出公式添加
|
5 years ago |
|
zhengyongxing
|
3603f5fa21
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
944a424b3c
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
44feb6957d
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
e4d1ced122
|
市场专员业绩提成bug修正
|
5 years ago |
|
zhengyongxing
|
b9255647f7
|
市场专员业绩提成汇总单检索
修正
|
5 years ago |
|
zhengyongxing
|
0ca629518d
|
市场专员业绩结算结构修改
|
5 years ago |
|
zhengyongxing
|
5c76d1180d
|
市场专员业绩结算结构修改
|
5 years ago |
|
zhengyongxing
|
4bfa0dfa2f
|
市场专员业绩结算结构修改
|
5 years ago |
|
zhengyongxing
|
8053806801
|
市场专员业绩bug修改
|
5 years ago |
|
zhengyongxing
|
f7c11991ca
|
市场专员业绩bug修改
|
5 years ago |
|
chenzhi
|
2a4541569d
|
优化列表显示
|
5 years ago |
|
chenzhi
|
c11266291f
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time
|
5 years ago |
|
chenzhi
|
63054ac0d8
|
优化订单校验
|
5 years ago |
|
zhengyongxing
|
de3d7d52b7
|
市场专员业绩计bug修正
|
5 years ago |
|
chenzhi
|
04e13844c3
|
zancun
|
5 years ago |
|
zhengyongxing
|
962d140d80
|
Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
|
5 years ago |
|
zhengyongxing
|
043ee29f54
|
市场专员业绩计bug修正
|
5 years ago |
|
zhengyongxing
|
8430444b8e
|
市场专员业绩计bug修正
|
5 years ago |
|
zhengyongxing
|
2da9821caf
|
市场专员业绩计算修正
|
5 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
5 years ago |
|
zhengyongxing
|
ea21948984
|
支付渠道bug修改
|
5 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
5 years ago |
|
chenzhi
|
c18eb439c5
|
优化游戏获取逻辑
|
5 years ago |
|
zhengyongxing
|
1c535ee74b
|
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
zhengyongxing
|
bdeacbd718
|
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
zhengyongxing
|
c96340afa9
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
048931ce9e
|
优化搜索3
|
5 years ago |
|
chenzhi
|
35380ae9b0
|
优化搜索2
|
5 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
5 years ago |
|
zhengyongxing
|
1e80004e3e
|
市场专员业绩管理bug修改
|
5 years ago |
|
zhengyongxing
|
17ff8d9029
|
市场专员业绩管理模板指定
|
5 years ago |
|
zhengyongxing
|
70d6c3c7bf
|
市场专员业绩管理权限判断
|
5 years ago |
|
zhengyongxing
|
80dc2b860c
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
Conflicts:
Application/Admin/Common/extend.php
Application/Admin/Controller/TimingController.class.php
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
5 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
5 years ago |
|
zhengyongxing
|
06bd0bf848
|
市场专员业绩管理代码提交
|
5 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
5 years ago |
|
廖金灵
|
4a755d2269
|
Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
|
5 years ago |
|
ELF
|
ecc228409d
|
修改
|
5 years ago |
|
廖金灵
|
ed9d193531
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
|
5 years ago |
|
zhengyongxing
|
3128c079d3
|
推广员充值换榜定时器优化
|
5 years ago |
|
zhengyongxing
|
ef8d16fc6e
|
推广员充值换榜定时器优化
|
5 years ago |
|
chenzhi
|
bc75da8c14
|
解决冲突
|
5 years ago |
|
zhengyongxing
|
15b9efcd7e
|
江息网络漏掉的修改
|
5 years ago |
|
zhengyongxing
|
1234349844
|
市场专员业绩计算修改
|
5 years ago |
|
chenzhi
|
f62cfca22b
|
隐藏推广公司分成比例
|
5 years ago |
|
zhengyongxing
|
dbad9a08db
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
Conflicts:
Application/Admin/Common/function.php
Application/Admin/Controller/TimingController.class.php
|
5 years ago |
|
chenzhi
|
21a738054a
|
隐藏推广公司比例
|
5 years ago |
|
zhengyongxing
|
39e2bce6dd
|
推广员充值统计提交
|
5 years ago |
|
zhengyongxing
|
2bc4bf79d9
|
市场结算管理公司税率提交
|
5 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
5 years ago |
|
chenzhi
|
a020cb26df
|
新增不验证手机 己方
|
5 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
5 years ago |
|
ELF
|
7c3a001e25
|
修改
|
5 years ago |
|
chenzhi
|
4fde001d4e
|
优化游戏分成比例不受档位限制
|
5 years ago |
|
zhengyongxing
|
682ce333b1
|
市场结算管理公司税率提交
|
5 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
5 years ago |
|
ELF
|
e94b6418f1
|
修改
|
5 years ago |
|
ELF
|
8224cfb362
|
修改
|
5 years ago |
|
ELF
|
77c692c44d
|
修改
|
5 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
5 years ago |
|
zhengyongxing
|
2fae4219df
|
公会统计去除
|
5 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
cd0d9e295f
|
市场专员结算代码上传
|
5 years ago |
|
zhengyongxing
|
379716298a
|
市场专员结算代码上传
|
5 years ago |
|
ELF
|
e3b53e7df1
|
修改
|
5 years ago |
|
ELF
|
73f5f4f5ea
|
修改
|
5 years ago |
|
ELF
|
38c10a0f7a
|
修改
|
5 years ago |
|
ELF
|
10aed50db7
|
修改
|
5 years ago |
|
ELF
|
f9b054e1cb
|
修改
|
5 years ago |
|
ELF
|
f0a8b6bc3b
|
修改
|
5 years ago |
|
ELF
|
6f2f588617
|
优化
|
5 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
5 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
5 years ago |
|
zhengyongxing
|
a2408407b7
|
上传市场专员结算代码
|
5 years ago |
|
廖金灵
|
bc00b1112f
|
Merge branch 'feature/apply_game' of wmtx/platform into release
task440
|
5 years ago |
|
廖金灵
|
db32f11215
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
|
5 years ago |
|
chenzhi
|
7d8dca7421
|
取消测试的虚拟验证码
|
5 years ago |
|
chenzhi
|
95d9f45612
|
新增检索
|
5 years ago |
|
廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
5 years ago |
|
yulingwei
|
c8924779c4
|
Merge branch 'release' into feature/ylw-06-17
|
5 years ago |
|
yulingwei
|
8c18f2aa1d
|
1
|
5 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
5 years ago |
|
ELF
|
2589806e62
|
解决冲突
|
5 years ago |
|
yulingwei
|
3f4406a1ee
|
Merge branch 'release' into feature/ylw-06-17
|
5 years ago |
|
yulingwei
|
0decb03cb1
|
merge
|
5 years ago |
|
ELF
|
a153fb9a0e
|
修改
|
5 years ago |
|
yulingwei
|
5b604ab073
|
upt
|
5 years ago |
|
chenzhi
|
ca551b9c50
|
己方公司新增搜索项目
|
5 years ago |
|
chenzhi
|
c335c1f0b3
|
优化补点和月结集合
|
5 years ago |
|
chenzhi
|
bffc9a32f1
|
数据迁移
|
5 years ago |
|
chenzhi
|
26ccc9c450
|
优化导出权限
|
5 years ago |
|
chenzhi
|
e96c6e8b52
|
公司获取优化
|
5 years ago |
|
chenzhi
|
511f53e83c
|
优化权限
|
5 years ago |
|
chenzhi
|
d845ab35a3
|
优化新增结算
|
5 years ago |
|
zhengyongxing
|
25ae6a03a4
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
|
5 years ago |
|
chenzhi
|
4b29d159e1
|
取消备注
|
5 years ago |
|
zhengyongxing
|
b664ba46ad
|
汇总单代码提交
|
5 years ago |
|
chenzhi
|
6c05756415
|
新增排序
|
5 years ago |
|
chenzhi
|
9d8ed80fcc
|
优化新增重算
|
5 years ago |
|
chenzhi
|
53b9513935
|
新增结算
|
5 years ago |
|
chenzhi
|
53004adf5d
|
新增打款
|
5 years ago |
chenzhi
|
a2454e0446
|
取消结算单下游个人导出
|
5 years ago |
|
zhengyongxing
|
9d43914b17
|
汇总单结算代码上传
|
5 years ago |
|
chenzhi
|
0ba02069a0
|
优化补点计算方式
|
5 years ago |
|
chenzhi
|
ec641257b0
|
优化下游渠道结算
|
5 years ago |
|
chenzhi
|
fdccc92c43
|
新增只支持脚本访问
|
5 years ago |
|
chenzhi
|
38ab488cd0
|
修复搜索错误
|
5 years ago |
|
chenzhi
|
036a710f2f
|
修复不修改不重审
|
5 years ago |
|
chenzhi
|
a9723597f0
|
优化推广比例未修改重审
|
5 years ago |
|
zhengyongxing
|
f7f862fd83
|
官方渠道修改江息网络
|
5 years ago |
|
yulingwei
|
e09296d10d
|
upt
|
5 years ago |
|
chenzhi
|
265384f2c8
|
优化审核乱跳
|
5 years ago |
|
chenzhi
|
994ee29b1d
|
优化审核列表乱跳
|
5 years ago |
|
chenzhi
|
ffb60d80a9
|
修复多家公司合作问题
|
5 years ago |
|
chenzhi
|
701c421d0c
|
上级改为通知成功
|
5 years ago |
|
chenzhi
|
31ef129b2d
|
修复己方公司不能删除
|
5 years ago |
|
chenzhi
|
ffee256f93
|
优化bug1
|
5 years ago |
|
chenzhi
|
d5aeb21b33
|
新增结算周期读取
|
5 years ago |
|
chenzhi
|
553d9b0f91
|
新增分成生效模板
|
5 years ago |
|
chenzhi
|
af1829c124
|
新增打款详情
|
5 years ago |
|
yulingwei
|
99fcc4cbbb
|
upt
|
5 years ago |
|
zhengyongxing
|
2ce274486d
|
官方渠道修改江息网络
|
5 years ago |
|
ELF
|
522f758bd5
|
修改
|
5 years ago |
|
zhengyongxing
|
8dd071ecc7
|
市场结算定时器优化
|
5 years ago |
|
chenzhi
|
3611e4855d
|
合并冲突
|
5 years ago |
|
zhengyongxing
|
edbd6f46a3
|
市场结算定时器找回
|
5 years ago |
|
ELF
|
e5a21b9224
|
修改
|
5 years ago |
|
yulingwei
|
0472fe9cbc
|
upt
|
5 years ago |
|
chenzhi
|
c7c67f279a
|
打款信息查看
|
5 years ago |
|
chenzhi
|
3ef24c2c57
|
新增打款信息编辑
|
5 years ago |
|
chenzhi
|
1f155020d4
|
新增是否允许打款
|
5 years ago |
|
zhengyongxing
|
9aed64f46d
|
推广员充值汇总优化，补单功能添加
|
5 years ago |
|
ELF
|
486b5e1f83
|
优化curl
|
5 years ago |
|
ELF
|
dc85bdb631
|
添加批量删除推广限制功能
|
5 years ago |
|
ELF
|
69b09c582f
|
添加落地页限制规则
|
5 years ago |
|
chenzhi
|
79a9a8c68c
|
新增重算
|
5 years ago |
|
chenzhi
|
d05d6e2159
|
新增导出
|
5 years ago |
|
chenzhi
|
3b8d6eb128
|
新增导出
|
5 years ago |
|
yulingwei
|
93601a3302
|
upt
|
5 years ago |
|
chenzhi
|
88c70c29db
|
新增0不查看
|
5 years ago |
|
yulingwei
|
e6c8b51127
|
upt
|
5 years ago |
|
chenzhi
|
547b512ead
|
暂存
|
5 years ago |
|
yulingwei
|
bbb7cb23f6
|
upt
|
5 years ago |
|
yulingwei
|
3530456cfa
|
upt
|
5 years ago |
|
chenzhi
|
0f632f386b
|
下游个人聚合
|
5 years ago |
|
yulingwei
|
f969802c26
|
upt
|
5 years ago |
|
廖金灵
|
a4d86b4fdd
|
Merge branch 'feature/promote_statistics' of wmtx/platform into master
推广员充值统计添加默认时间
|
5 years ago |
|
chenzhi
|
7d3e90514f
|
新增个人聚合
|
5 years ago |
|
chenzhi
|
f2ce52ada5
|
暂存
|
5 years ago |
|
zhengyongxing
|
711f98ef86
|
推广员充值统计添加默认时间
|
5 years ago |
|
廖金灵
|
22e5fe8d76
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
5 years ago |
|
ELF
|
1c3bb3604e
|
优化打包
|
5 years ago |
|
廖金灵
|
6a8f1a517f
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
5 years ago |
|
ELF
|
4f8f18a680
|
优化打包
|
5 years ago |
|
廖金灵
|
154a0115dc
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
5 years ago |
|
ELF
|
29595ff5d9
|
优化打包
|
5 years ago |
|
zhengyongxing
|
4352b0c733
|
将官方渠道修改为江息网络
|
5 years ago |
|
廖金灵
|
bd8842759e
|
Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
|
5 years ago |
|
ELF
|
02259ae330
|
修改bug
|
5 years ago |
|
ELF
|
769193883d
|
修改bug
|
5 years ago |
|
ELF
|
d5d6c255b0
|
优化打包
|
5 years ago |
|
yulingwei
|
6ada5711ab
|
upt
|
5 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
dff3542fdd
|
新增个人信息获取
|
5 years ago |
|
zhengyongxing
|
6da0ec1607
|
用户列表修改提交
|
5 years ago |
|
chenzhi
|
c6f4149d6a
|
修改下游个人聚合
|
5 years ago |
|
chenzhi
|
a3633ea52e
|
新增下游查看导出
|
5 years ago |
|
廖金灵
|
b62eb3be7c
|
Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release
隐藏市场总监电话
|
5 years ago |
|
chenzhi
|
7ac118c024
|
下游公司查看
|
5 years ago |
|
chenzhi
|
7a5c42eb5e
|
上游导出优化
|
5 years ago |
|
chenzhi
|
427d6457fc
|
上游查看及导出
|
5 years ago |
|
chenzhi
|
eeec8b13f2
|
cp查看
|
5 years ago |
|
chenzhi
|
4e4da92420
|
优化比例
|
5 years ago |
|
chenzhi
|
2cf0fdf905
|
新增公会归属编辑规则修改
|
5 years ago |
|
chenzhi
|
22aa5d3dd4
|
暂存
|
5 years ago |
|
zhengyongxing
|
f08c0cec9b
|
苹果beta包添加测试ip白名单
|
5 years ago |
|
chenzhi
|
02e7d85e44
|
优化生成结算单
|
5 years ago |
|
chenzhi
|
bf24f9bc9d
|
开户网点该帐户名
|
5 years ago |
|
chenzhi
|
f7d67ff4c4
|
新增合作方阿里账号及用户
|
5 years ago |
|
chenzhi
|
cd0ff2ef8a
|
暂存
|
5 years ago |
|
zhengyongxing
|
1e4a1aef4e
|
苹果beta包添加第三方支付名单
|
5 years ago |
|
chenzhi
|
466f1f4680
|
汇总提交ok
|
5 years ago |
|
chenzhi
|
c39da62037
|
新增是否打款
|
5 years ago |
|
chenzhi
|
e1d624fe8b
|
优化导出并聚合数据
|
5 years ago |
|
chenzhi
|
903fc71255
|
新增补链账号错误
|
5 years ago |
|
chenzhi
|
8bfe249251
|
新增备注
|
5 years ago |
|
chenzhi
|
c5e3d78835
|
新增导出
|
5 years ago |
|
chenzhi
|
1d92fdb1db
|
新增重算接口
|
5 years ago |
|
chenzhi
|
e80d4eb539
|
新增确认
|
5 years ago |
|
chenzhi
|
93a8bb70e1
|
新增编辑
|
5 years ago |
|
chenzhi
|
669bfa8f25
|
暂存
|
5 years ago |
tping
|
9fd06c27d3
|
Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
6162f9f8a1
|
生成上下游结算单
|
5 years ago |
|
chenzhi
|
380243dbb8
|
优化结算的补点
|
5 years ago |
|
chenzhi
|
4c0c51e0ae
|
上游结算ok
|
5 years ago |
|
chenzhi
|
fe7d21943b
|
暂存2
|
5 years ago |
|
chenzhi
|
c71c142227
|
暂存
|
5 years ago |
|
chenzhi
|
b4c93cc433
|
接口还原分离
|
5 years ago |
|
chenzhi
|
c59a314afe
|
优化聚合cp获取接口
|
5 years ago |
sunke
|
51551e91df
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary
|
5 years ago |
|
zhengyongxing
|
394ce7a544
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit
|
5 years ago |
|
zhengyongxing
|
9aae41fd20
|
ip封禁隐藏区域
|
5 years ago |
|
chenzhi
|
5c1a8d69a0
|
新增生效列表页面
|
5 years ago |
|
chenzhi
|
8a508c050d
|
新增编辑
|
5 years ago |
|
chenzhi
|
4b8538a3bb
|
新增审核操作
|
5 years ago |
|
chenzhi
|
f20cfde7c7
|
新增审核列表导出
|
5 years ago |
|
chenzhi
|
e684191b45
|
优化审核列表
|
5 years ago |
|
chenzhi
|
b5a604d385
|
优化添加
|
5 years ago |
|
chenzhi
|
e5dc86118e
|
新增优化
|
5 years ago |
|
chenzhi
|
1139b37a50
|
新增公司关系绑定
|
5 years ago |
|
chenzhi
|
3b8e7eb2b0
|
推广游戏分成管理ok
|
5 years ago |
|
chenzhi
|
a8fddb8f2f
|
优化游戏分成
|
5 years ago |
|
chenzhi
|
0d8ec00225
|
优化排序
|
5 years ago |
|
chenzhi
|
8a83e17485
|
新增导出
|
5 years ago |
|
chenzhi
|
4533b84d2c
|
权限
|
5 years ago |
|
zhengyongxing
|
0953eb4dd4
|
Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms
|
5 years ago |
|
chenzhi
|
6a3b9b6da3
|
新增游戏分成比例
|
5 years ago |
|
chenzhi
|
1c8ef3493d
|
优化比例模板
|
5 years ago |
|
chenzhi
|
c1283ebfeb
|
游戏比例模板导出删除
|
5 years ago |
|
chenzhi
|
adbc76c3ae
|
游戏模板修改
|
5 years ago |
|
chenzhi
|
3a8273283e
|
游戏比例模板新增
|
5 years ago |
|
万盟天下
|
04178efac9
|
Merge branch 'hotfix/admin_three_optimization' of wmtx/platform into release
优化合作公司列表显示
|
5 years ago |
|
chenzhi
|
9c1a12296d
|
优化合作公司列表显示
|
5 years ago |
|
chenzhi
|
6c6dddf6ac
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
|
chenzhi
|
982a7f4c1b
|
更新合作公司列表显示
|
5 years ago |
|
chenzhi
|
fd4e0baffd
|
新增游戏比例模板
|
5 years ago |
|
zhengyongxing
|
fba271cd64
|
Merge branches 'fix/admin_second_optimization' and 'master' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
|
chenzhi
|
8b9a4e73fe
|
接口数据1
|
5 years ago |
|
zhengyongxing
|
1c5a02594a
|
身份认证后台添加
|
5 years ago |
|
chenzhi
|
e84d545a2d
|
Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
|
zhengyongxing
|
e949f92434
|
ip限制操作日志添加
|
5 years ago |
|
廖金灵
|
2d7189a224
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
优化空值修改
|
5 years ago |
|
chenzhi
|
42a9b318fb
|
优化空值修改5
|
5 years ago |
|
chenzhi
|
4ebe2780cc
|
优化空值修改4
|
5 years ago |
|
chenzhi
|
3b6f8c70cc
|
优化可以为空填写
|
5 years ago |
|
chenzhi
|
ba9468fedc
|
新增打款配置
|
5 years ago |
|
廖金灵
|
d99db944c5
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
bug修复及cp下游接口添加
|
5 years ago |
|
chenzhi
|
748ec401f3
|
新增打款配置1
|
5 years ago |
|
chenzhi
|
6c4319cfe2
|
Revert "暂存"
This reverts commit a685c14e23.
|
5 years ago |
|
chenzhi
|
a685c14e23
|
暂存
|
5 years ago |
|
chenzhi
|
ec4d180287
|
优化公会更改
|
5 years ago |
|
chenzhi
|
09e71420e0
|
优化推广员归属审核
|
5 years ago |
|
chenzhi
|
e1e431804c
|
优化审批
|
5 years ago |
|
chenzhi
|
6557938e53
|
优化聚合渠道财务结算单
|
5 years ago |
|
chenzhi
|
5ebdda1c85
|
修改合作方可为空
|
5 years ago |
|
sunke
|
a4377c017e
|
支付设置
|
5 years ago |
|
chenzhi
|
50462e3470
|
优化合作方必填项
|
5 years ago |
|
chenzhi
|
35d8e379d8
|
优化操作行为日志隐藏玩家
|
5 years ago |
|
chenzhi
|
673e3fb5cd
|
角色权限修改状态提醒优化
|
5 years ago |
|
chenzhi
|
c93a8577c4
|
合并
|
5 years ago |
张谷诚
|
bb833deb98
|
Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
|
5 years ago |
|
chenzhi
|
ae4c58b6fd
|
修改推广员流水可选填
|
5 years ago |
|
zhengyongxing
|
132b601f74
|
测试资源搜索功能添加
|
5 years ago |
|
zhengyongxing
|
878414aeb2
|
测试资源搜索修正
|
5 years ago |
|
张谷诚
|
c5f9a25a9e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
|
5 years ago |
|
zyx
|
ee9f53ce0b
|
导出权限bug修改
|
5 years ago |
|
zhengyongxing
|
301a5a7f5a
|
导出bug修改
|
5 years ago |
|
zhengyongxing
|
5e71728097
|
导出bug修改
|
5 years ago |
|
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
|
chenzhi
|
861fd07965
|
优化检索
|
5 years ago |
|
chenzhi
|
834dbe0867
|
优化导出支付信息不记录
|
5 years ago |
|
zhengyongxing
|
1659c55ef2
|
用户行为日志修改
|
5 years ago |
|
zhengyongxing
|
0ca2f2a064
|
游戏统计导出修改
|
5 years ago |
|
chenzhi
|
2ad89c2fb6
|
优化导出时间
|
5 years ago |
|
chenzhi
|
5a9fc76374
|
申请编辑信息遮罩不关闭
|
5 years ago |
|
zhengyongxing
|
4d43e877a1
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
acaebe0217
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
60c0c8ee39
|
Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
c58cdd31af
|
用户行为日志导出修正
|
5 years ago |
|
zhengyongxing
|
613d60e4a7
|
数据权限配置修改
|
5 years ago |
|
廖金灵
|
e88867abe5
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
|
5 years ago |
|
chenzhi
|
973f7ca394
|
现在权限不验证
|
5 years ago |
|
廖金灵
|
ff5b2e3483
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
|
5 years ago |
|
chenzhi
|
21a985ae82
|
聚合财务结算单ok
|
5 years ago |
|
zhengyongxing
|
4f88cd025e
|
绑币导出修正
|
5 years ago |
|
chenzhi
|
8137778ec1
|
新增聚合操作日志
|
5 years ago |
|
zhengyongxing
|
38f478d63d
|
数据调整修改
|
5 years ago |
|
zhengyongxing
|
8d7dbe5469
|
测试资源修改
|
5 years ago |
|
zhengyongxing
|
727b335b45
|
测试资源修改
|
5 years ago |
|
chenzhi
|
63f5354dc3
|
优化重算
|
5 years ago |
|
zhengyongxing
|
5dbd0eb8fa
|
业绩配置修改
|
5 years ago |
|
zhengyongxing
|
a9ce0585cc
|
测试资源配置
|
5 years ago |
|
chenzhi
|
2a28cf9008
|
聚合财务优化权限
|
5 years ago |
|
zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
|
chenzhi
|
fe662ce160
|
审核子操作ok
|
5 years ago |
|
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
|
chenzhi
|
16d9813e18
|
聚合财务重算
|
5 years ago |
|
zhengyongxing
|
a9e6dafad3
|
行为日志修正
|
5 years ago |
|
chenzhi
|
253b47b2a9
|
聚合财务子操作
|
5 years ago |
|
chenzhi
|
990c62b06a
|
批注增删改查
|
5 years ago |
|
chenzhi
|
6b5f60f8e6
|
新增凭证增删改查
|
5 years ago |
|
chenzhi
|
afd362d847
|
聚合结算单导出优化3
|
5 years ago |
|
chenzhi
|
2fc38b25b6
|
聚合结算单导出优化2
|
5 years ago |
|
chenzhi
|
ce4c938080
|
优化聚合结算导出
|
5 years ago |
|
chenzhi
|
cf9480eb89
|
聚合财务导出
|
5 years ago |
|
chenzhi
|
422728ed11
|
聚合财务编辑
|
5 years ago |
|
zhengyongxing
|
0ebde4cb17
|
导出权限修正
|
5 years ago |
|
chenzhi
|
bf7c7ed14f
|
审核
|
5 years ago |
|
zhengyongxing
|
e60b9b2edf
|
测试资源批量封号
|
5 years ago |
|
chenzhi
|
114cf4a503
|
聚合对账新增对账金额统计
|
5 years ago |
|
chenzhi
|
51322e3317
|
聚合财务2
|
5 years ago |
|
chenzhi
|
6d0e7c3a00
|
聚合对账1
|
5 years ago |
|
chenzhi
|
73ac725950
|
聚合脚本ok
|
5 years ago |
|
ELF
|
0af6a53ba7
|
后台arpu功能优化
|
5 years ago |
|
chenzhi
|
95cd9993e2
|
聚合财务1
|
5 years ago |
|
zhengyongxing
|
941f27e2e3
|
获取用户账号的方法添加
|
5 years ago |
|
zhengyongxing
|
4d938b85f4
|
导出账号权限修改配置
|
5 years ago |
|
zhengyongxing
|
0482836a8e
|
导出账号权限添加
|
5 years ago |
|
zhengyongxing
|
a5554f7fa3
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
295ca2d803
|
推广员业务配置功能添加
|
5 years ago |
|
万盟天下
|
aa663b3c02
|
Merge branch 'release' of wmtx/platform into master
优化游戏管理
|
5 years ago |
|
ELF
|
144e4e4ea7
|
计算ARPU
|
5 years ago |
|
ELF
|
908722c5be
|
修改
|
5 years ago |
|
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
|
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
|
廖金灵
|
a6dffecaf9
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复统计问题
|
5 years ago |
|
yulingwei
|
8fc1199e79
|
upt
|
5 years ago |
|
yulingwei
|
70f3da8017
|
upt
|
5 years ago |
|
廖金灵
|
7ab6c8ad68
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
|
yulingwei
|
c3cb357e1c
|
upt
|
5 years ago |
|
廖金灵
|
b09ccfc42d
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
|
yulingwei
|
872a76356d
|
upt
|
5 years ago |
|
廖金灵
|
820885f3dd
|
Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
|
5 years ago |
|
sunke
|
bde08adcc2
|
平台币
|
5 years ago |
|
廖金灵
|
8b2ae9d6da
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
|
5 years ago |
|
廖金灵
|
72d1d2f338
|
Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
sunke
|
163388e75c
|
平台币
|
5 years ago |
|
sunke
|
ae0e10166a
|
pt
|
5 years ago |
|
sunke
|
07c385e561
|
平台
|
5 years ago |
|
sunke
|
aa14aa95a6
|
平台
|
5 years ago |
|
sunke
|
b6649a7b9d
|
平台币
|
5 years ago |
|
yulingwei
|
ccc159d3b2
|
upt
|
5 years ago |
|
yulingwei
|
42026e753a
|
upt
|
5 years ago |
|
yulingwei
|
7b3006f871
|
upt
|
5 years ago |
|
yulingwei
|
5009a327db
|
upt
|
5 years ago |
|
yulingwei
|
f1428a8fe7
|
upt
|
5 years ago |
|
sunke
|
5fa22cfa40
|
弹窗
|
5 years ago |
|
sunke
|
fee97bb00a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
|
5 years ago |
|
yulingwei
|
dec978da7a
|
upt
|
5 years ago |
|
yulingwei
|
e462305587
|
upt
|
5 years ago |
|
yulingwei
|
312448c724
|
upt
|
5 years ago |
|
sunke
|
253c956794
|
平台币
|
5 years ago |
|
sunke
|
2adcb68c06
|
平台币新增需求
|
5 years ago |
|
sunke
|
97e8397d76
|
文件夹优化
|
5 years ago |
|
sunke
|
1fe794b597
|
平台规则样式优化
|
5 years ago |
|
sunke
|
ec309c2b6a
|
规则
|
5 years ago |
|
sunke
|
bdb688c985
|
编辑规则
|
5 years ago |
|
zhengyongxing
|
2a54b0ed08
|
汇付宝添加支付宝与微信
|
5 years ago |
|
ELF
|
94575cae29
|
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
yulingwei
|
c1d03cc526
|
upt
|
5 years ago |
|
yulingwei
|
9d6bf8225a
|
upt
|
5 years ago |
|
yulingwei
|
007374e121
|
upt
|
5 years ago |
|
廖金灵
|
8dc7adb539
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
|
5 years ago |
|
sunke
|
ce2408576c
|
充值方式统计匹配支付渠道
|
5 years ago |
|
sunke
|
6cc33a7fe8
|
导出顺序
|
5 years ago |
|
sunke
|
15f6cb19a3
|
渠道支付顺序
|
5 years ago |
|
ELF
|
2a2e5f0d31
|
添加tf礼包问题
|
5 years ago |
|
张谷诚
|
c5af3c29d7
|
Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
廖金灵
|
9f202c3991
|
Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
|
5 years ago |
|
chenzhi
|
9237bc3cc8
|
优化选择
|
5 years ago |
|
chenzhi
|
abf43566e4
|
调整参数
|
5 years ago |
|
廖金灵
|
86a90467ff
|
Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
|
5 years ago |
|
zhengyongxing
|
d4aafd2983
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
chenzhi
|
14ffc00f86
|
优化权限处理
|
5 years ago |
|
chenzhi
|
d4a498baba
|
优化用户登录时间为0时为暂无登录
|
5 years ago |
|
chenzhi
|
b1701889c4
|
优化财务比较金额不符规则
|
5 years ago |
|
chenzhi
|
5ddf75a600
|
财务对比ok
|
5 years ago |
|
chenzhi
|
b2ad4e8b6e
|
财务对比 v1
|
5 years ago |
|
chenzhi
|
a2db46d1c0
|
财务对比首页
|
5 years ago |
|
zhengyongxing
|
f37cdc596d
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
chenzhi
|
79f4719dec
|
财务对比7
|
5 years ago |
|
chenzhi
|
c4eb963cfe
|
财务比对5
|
5 years ago |
|
zhengyongxing
|
573e580778
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
bba97196ec
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
2fab9d3ef9
|
支付渠道详情统计bug修改
|
5 years ago |
|
zhengyongxing
|
45847a8194
|
支付渠道详情统计bug修改
|
5 years ago |
|
chenzhi
|
6abef9385e
|
优化测试服订单导出
|
5 years ago |
|
chenzhi
|
202f9a45d1
|
财务对比4
|
5 years ago |
|
zhengyongxing
|
e34c553358
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
8d742886a7
|
支付渠道统计bug修改
|
5 years ago |
|
chenzhi
|
effe6c572e
|
财务比较3
|
5 years ago |
|
zhengyongxing
|
96eee4f9f5
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
ab01c02606
|
支付渠道意愿统计修改
|
5 years ago |
|
chenzhi
|
f3a662324d
|
修正测试服订单检索错误问题
|
5 years ago |
|
chenzhi
|
def286ec80
|
财务比较2
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
ea69ecb086
|
财务比较2
|
5 years ago |