chenzhi
|
5bdc0e6f6e
|
优化汇总方案
|
4 years ago |
tping
|
0d52dc7d61
|
1126
|
4 years ago |
|
chenzhi
|
55dd67e34d
|
优化撤回
|
4 years ago |
|
chenzhi
|
56681580dd
|
合并
|
4 years ago |
|
chenzhi
|
6d4fce53eb
|
优化线下打款
|
4 years ago |
|
chenzhi
|
bd125be3dd
|
优化汇总审核流程
|
4 years ago |
 ELF
|
c339623c78
|
优化
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
zhengyongxing
|
1626640066
|
11月功能提交
|
4 years ago |
|
ELF
|
773068b57c
|
优化代码
|
4 years ago |
|
zhengyongxing
|
4eff2f0aaa
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
d6b1916a5d
|
11月功能提交
|
4 years ago |
|
ELF
|
dd7068e3ae
|
改用redis存储session
|
4 years ago |
|
tping
|
025d90f5fa
|
1126
|
4 years ago |
|
chenzhi
|
ad1d4e65a5
|
优化游戏汇总
|
4 years ago |
|
chenzhi
|
bea27fd5de
|
优化游戏汇总
|
4 years ago |
|
tping
|
c75d73c9f7
|
1126
|
4 years ago |
|
ELF
|
6a50654045
|
游戏统计/后台登录时间修改
|
4 years ago |
|
chenzhi
|
7f9bb248dd
|
优化推广员统计
|
4 years ago |
|
chenzhi
|
1f694ef47b
|
优化推广员充值
|
4 years ago |
|
chenzhi
|
e896f5e649
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
|
4 years ago |
|
chenzhi
|
a6f9d82245
|
优化推广员累计注册
|
4 years ago |
|
chenzhi
|
7a876e01ab
|
优化新增推广员汇总
|
4 years ago |
|
zhengyongxing
|
f49cd75e86
|
11月功能提交
|
4 years ago |
|
zhengyongxing
|
6811eb806c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
Application/Admin/Controller/CompanyStatementSetController.class.php
Data/update.sql
|
4 years ago |
|
廖金灵
|
da2dc09690
|
Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
e098384635
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
3656c555d1
|
11月功能提交
|
4 years ago |
|
chenzhi
|
ffd8c92940
|
优化奖罚
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
ELF
|
eef296ea08
|
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
b92f564a49
|
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
ELF
|
ceadb8562f
|
新增60/90日留存率统计
|
4 years ago |
|
ELF
|
5253a76963
|
优化
|
4 years ago |
|
ELF
|
afc95791d2
|
优化
|
4 years ago |
|
chenzhi
|
d0a61d3e87
|
游戏充值导出新增cp列
|
4 years ago |
|
ELF
|
d0b2e5f459
|
优化
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
ELF
|
e1352fea1e
|
修改
|
4 years ago |
|
chenzhi
|
cdd1cd7d7f
|
优化页面页数
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
廖金灵
|
648cde1eff
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
|
4 years ago |
|
ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
廖金灵
|
38dc6c0c56
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
|
zhengyongxing
|
6021f91604
|
公会订单添加所属商户
|
4 years ago |
|
zhengyongxing
|
3f04fa1507
|
公会统计商户名称修改
|
4 years ago |
|
zhengyongxing
|
deee3228dd
|
公会统计商户导出
|
4 years ago |
|
zhengyongxing
|
58ff5ad1ed
|
公会统计--订单详情 新增所属商户展示
|
4 years ago |
|
ELF
|
f490f10ee5
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
|
4 years ago |
|
zhengyongxing
|
767ce5734d
|
市场业绩重算只重算上个月提交
|
4 years ago |
|
zhengyongxing
|
a3b86e9339
|
市场业绩提成修正
|
4 years ago |
|
zhengyongxing
|
d85ac9066d
|
市场业绩bug修改
|
4 years ago |
|
zhengyongxing
|
6c005f01f6
|
市场业绩比例永久判断bug修改
|
4 years ago |
|
zhengyongxing
|
48f4fef494
|
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
02635cc6e9
|
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
324deba9c2
|
外团特殊比例功能提交
|
4 years ago |
|
zhengyongxing
|
24f3cbc99e
|
外团特殊比例功能提交
|
4 years ago |
|
zhengyongxing
|
cf21a4f324
|
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
6efa26ecfd
|
外团特殊比例自动审核通过
|
4 years ago |
|
zhengyongxing
|
d73602d30b
|
Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other
|
4 years ago |
|
zhengyongxing
|
0155111706
|
特殊比例申请比例限制提交
|
4 years ago |
|
chenzhi
|
3db0914108
|
优化导出公司
|
4 years ago |
|
zhengyongxing
|
b3658dfaa9
|
比例方法提交
|
4 years ago |
|
chenzhi
|
833619518b
|
优化测试
|
4 years ago |
|
chenzhi
|
9002ae24be
|
优化重算
|
4 years ago |
陈志
|
24bbce9d66
|
Merge branch 'feature/add_item' of wmtx/platform into release
优化上游
|
4 years ago |
|
chenzhi
|
d029e4562d
|
优化上游
|
4 years ago |
|
陈志
|
e12add2432
|
Merge branch 'feature/add_item' of wmtx/platform into release
优化上游pool
|
4 years ago |
|
chenzhi
|
6f90b18be9
|
优化上游pool
|
4 years ago |
郑永星
|
2496f1f64b
|
Merge branch 'feature/add_item_other' of wmtx/platform into release
内团推广游戏提示语修改
|
4 years ago |
|
zhengyongxing
|
178f89f43b
|
内团推广游戏提示语修改
|
4 years ago |
|
郑永星
|
a9f96722b1
|
Merge branch 'feature/add_item_other' of wmtx/platform into release
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
25e710c27e
|
外团推广功能提交
|
4 years ago |
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
|
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
4 years ago |
|
zhengyongxing
|
0f44573fe2
|
市场业绩提交
|
4 years ago |
|
zhengyongxing
|
bb5547fb6f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
ce3aa147e5
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
ccf27d77a1
|
市场业绩删除修正
|
4 years ago |
|
chenzhi
|
9083471980
|
优化补点
|
4 years ago |
|
zhengyongxing
|
295f86e588
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
7463222308
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
3f6472e64c
|
优化下游个人补点
|
4 years ago |
|
zhengyongxing
|
e33b19d4b0
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
4e8cb8dfe1
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f569747948
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f38b9026b5
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
f6f9437ed0
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
b0b893e51d
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
80b148d6c5
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
6ce7377dc1
|
优化补点
|
4 years ago |
|
zhengyongxing
|
859f5b58c9
|
汇总功能还原修正
|
4 years ago |
|
zhengyongxing
|
f450df3265
|
汇总功能修正
|
4 years ago |
|
zhengyongxing
|
54a0fde480
|
汇总公司与上游回退
|
4 years ago |
|
zhengyongxing
|
233fa89251
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
38fb5398d1
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
27c95792ff
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
def69bf6aa
|
外团推广功能修正提交
|
4 years ago |
|
zhengyongxing
|
0af52ad4ea
|
汇总金额为空时添加数据
|
4 years ago |
|
zhengyongxing
|
befa97e04d
|
Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
|
chenzhi
|
96b296a4b6
|
优化比例为空
|
4 years ago |
|
zhengyongxing
|
8340ddc115
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
c27315d3c0
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
ded1da96f9
|
Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
|
chenzhi
|
7ade60fb02
|
优化比例获取
|
4 years ago |
|
zhengyongxing
|
a5c7c224aa
|
比例功能提交
|
4 years ago |
|
zhengyongxing
|
823e241f2e
|
外团推广功能bug修正
|
4 years ago |
|
zhengyongxing
|
97c33c8e1b
|
游戏比例公用方法修正
|
4 years ago |
|
zhengyongxing
|
34b12ad382
|
定时器功能提交
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2dbb4a7940
|
市场部提示语修改
|
4 years ago |
|
zhengyongxing
|
c1b556b0b1
|
市场业绩排序修改
|
4 years ago |
|
chenzhi
|
10d13472ec
|
紧急修复外团选择游戏
|
4 years ago |
|
zhengyongxing
|
6ac5c1d524
|
比例逻辑修改
|
4 years ago |
|
zhengyongxing
|
0c69c8f662
|
汇总结算结算时间位置修改
|
4 years ago |
|
zhengyongxing
|
40664b5f8d
|
市场业绩功能修改，将不结算毛利以日来统计
|
4 years ago |
|
zhengyongxing
|
ba6323203a
|
模板比例bug修改提交
|
4 years ago |
|
zhengyongxing
|
2848f0ce90
|
外团推广游戏功能高亮显示
|
4 years ago |
|
zhengyongxing
|
2914f9964c
|
汇总编辑结算金额总计添加
|
4 years ago |
|
zhengyongxing
|
aa852a9a7f
|
外团推广功能金额修改
|
4 years ago |
|
zhengyongxing
|
f0cbe3cafb
|
周结算金额bug修改
|
4 years ago |
|
zhengyongxing
|
86769746ef
|
外团可申请游戏bug修改
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
5c57abc794
|
历史流水比例修正
|
4 years ago |
|
zhengyongxing
|
f8a7d53ac8
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
a00834e4e5
|
外团推广功能不结算提交
|
4 years ago |
|
zhengyongxing
|
9c49d8bedc
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
3855d8d3a9
|
市场业绩的功能提交
|
4 years ago |
|
ELF
|
47ff398bf4
|
修改
|
4 years ago |
|
ELF
|
ffad0d78c5
|
修改
|
4 years ago |
|
ELF
|
62d2eaef72
|
去除商户规则配置删除功能
|
4 years ago |
|
ELF
|
3a4fb51222
|
修改支付商户规则bug
|
4 years ago |
|
ELF
|
e25f30d13c
|
修改
|
4 years ago |
|
ELF
|
dc5e032817
|
修改
|
4 years ago |
|
ELF
|
fe55de4aaf
|
修改
|
4 years ago |
|
zhengyongxing
|
32b139a976
|
比例时间排序
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
|
ELF
|
b44a5118cf
|
修改
|
4 years ago |
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
ELF
|
36c240c608
|
修改
|
4 years ago |
|
zhengyongxing
|
68ba764d72
|
Merge branch 'hotfix/modify_special_piont' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
d9b37792fd
|
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
6b47baf59a
|
汇总编辑前端修改
|
4 years ago |
|
ELF
|
ae3e49b95f
|
修改
|
4 years ago |
|
ELF
|
f77505925f
|
修改
|
4 years ago |
|
ELF
|
f3771dfd2d
|
修改
|
4 years ago |
|
ELF
|
a10bb888da
|
修改bug
|
4 years ago |
|
zhengyongxing
|
4f35cacbab
|
汇总模板修改提交
|
4 years ago |
|
ELF
|
36c4c666ec
|
修改bug
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
8e4ba0e20e
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
廖金灵
|
662efdb613
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
3f90e1d9ee
|
汇总审批重算状态修正
|
4 years ago |
|
zhengyongxing
|
723b3c9fa2
|
汇总重算提示语修正
|
4 years ago |
|
zhengyongxing
|
e7b64f27f2
|
汇总重算提示语修正
|
4 years ago |
|
郑永星
|
8d37653db4
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出公式添加
|
4 years ago |
|
zhengyongxing
|
ff46e189cc
|
聚合结算单导出公式添加
|
4 years ago |
|
郑永星
|
a8c008923e
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总导出bug修正
|
4 years ago |
|
zhengyongxing
|
053e8acb8f
|
汇总导出bug修正
|
4 years ago |
|
郑永星
|
6cbc8e0102
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
|
4 years ago |
|
zhengyongxing
|
1f31244d10
|
聚合汇总导出bug修改
|
4 years ago |
|
郑永星
|
37dd11369e
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
ac5c1a199c
|
聚合结算单导出bug修正
|
4 years ago |
|
廖金灵
|
e916641647
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
郑永星
|
ac14a6be90
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
zyx
|
3db4fe1f60
|
聚合结算单导出个人与公司导出不相同
|
4 years ago |
|
zyx
|
b92ce713b3
|
聚合结算单上线
|
4 years ago |
|
廖金灵
|
ef9a6d446b
|
Merge branch 'feature/promote_level_sys' of wmtx/platform into master
游戏统计bug
|
4 years ago |
|
ELF
|
2b1980bfbd
|
修改
|
4 years ago |
|
廖金灵
|
51e3863b82
|
Merge branch 'feature/add_item' of wmtx/platform into master
导出公式添加
|
4 years ago |
|
zhengyongxing
|
f72bb66356
|
导出公式添加
|
4 years ago |
|
廖金灵
|
a2a9625933
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加，公司绑定编辑开放
|
4 years ago |
|
郑永星
|
cdcfc02614
|
Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定参数错误修正
|
4 years ago |
|
zhengyongxing
|
0d13b05dc0
|
公司绑定参数错误修正
|
4 years ago |
|
郑永星
|
38eb0f4957
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
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 |
|
郑永星
|
d7edb41f44
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
01df95637a
|
汇总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 |
|
chenzhi
|
f311da5208
|
优化银行卡号不限制
|
4 years ago |
|
zyx
|
a2d68a2752
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c99cad808c
|
汇总状态的操作修改
|
4 years ago |