 廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
4 years ago |
chenzhi
|
511f53e83c
|
优化权限
|
4 years ago |
|
chenzhi
|
0ba02069a0
|
优化补点计算方式
|
4 years ago |
zhengyongxing
|
9aed64f46d
|
推广员充值汇总优化，补单功能添加
|
4 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
e1d624fe8b
|
优化导出并聚合数据
|
5 years ago |
|
chenzhi
|
c5e3d78835
|
新增导出
|
5 years ago |
|
chenzhi
|
e80d4eb539
|
新增确认
|
5 years ago |
|
chenzhi
|
93a8bb70e1
|
新增编辑
|
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 |
|
zhengyongxing
|
5f0b7a6de0
|
充值方式文字修正，金猪改成苹果
|
5 years ago |
sunke
|
d7e61edaa1
|
汇付宝
|
5 years ago |
|
chenzhi
|
afee89ec03
|
优化模板无聚合
|
5 years ago |
|
chenzhi
|
6a3b9b6da3
|
新增游戏分成比例
|
5 years ago |
|
chenzhi
|
fd4e0baffd
|
新增游戏比例模板
|
5 years ago |
|
sunke
|
a4377c017e
|
支付设置
|
5 years ago |
|
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
|
chenzhi
|
3e7778df35
|
优化零元问题
|
5 years ago |
|
zhengyongxing
|
4d938b85f4
|
导出账号权限修改配置
|
5 years ago |
|
zhengyongxing
|
0482836a8e
|
导出账号权限添加
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
c45ca2942d
|
优化设备名称函数
|
5 years ago |
|
chenzhi
|
6f7e0de83d
|
优化平台币设备，名称
|
5 years ago |
|
chenzhi
|
f0a19cfc99
|
优化设备名称为字典
|
5 years ago |
|
chenzhi
|
9064fc7c58
|
游戏统计 游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
|
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
|
chenzhi
|
ccda6e0b39
|
开启操作日志
|
5 years ago |
|
ELF
|
9e82faf6f3
|
关闭后台操作日志
|
5 years ago |
|
chenzhi
|
0344471659
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
cfbbf8e76b
|
优化默认公司名称为海南万盟天下科技
|
5 years ago |
|
zhengyongxing
|
c6eef5124d
|
测试资源修改
|
5 years ago |
|
zhengyongxing
|
800680c6c0
|
测试资源申请审核验证增加区服
|
5 years ago |
|
zhengyongxing
|
d6db0d3789
|
测试资源根据可用余额进行验证
|
5 years ago |
|
zhengyongxing
|
f840a59ce2
|
日志操作bug修复
|
5 years ago |
|
chenzhi
|
0b8cf1d3ee
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
44f44d0c4a
|
操作日志函数修改
|
5 years ago |
|
zhengyongxing
|
3b73c1d340
|
操作日志bug修正
|
5 years ago |
liuweiwen
|
010080e32b
|
Merge branch 'feature/yibao_company' into release
|
5 years ago |
|
liuweiwen
|
f35c7bdc77
|
实时充值查询增加易宝支付
|
5 years ago |
|
liuweiwen
|
969bf4dc8a
|
Merge branch 'feature/yibao_company' into release
# Conflicts:
# Application/Admin/Common/extend.php
|
5 years ago |
|
liuweiwen
|
5d596094a6
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
3b415976eb
|
增加易宝支付
|
5 years ago |
zhanglingsheng
|
c6e1493035
|
易宝支付
|
5 years ago |
|
zhengyongxing
|
04f2b0c8df
|
Merge branch 'feature/operation_log' into release
# Conflicts:
# Application/Admin/Common/extend.php
# Data/update.sql
|
5 years ago |
|
zhanglingsheng
|
95f93bdc04
|
配置添加易宝支付
|
5 years ago |
|
zhanglingsheng
|
ee3db4d472
|
获取支付配置添加易宝支付
|
5 years ago |
|
zhengyongxing
|
3c628fa1c6
|
统计日志添加
|
5 years ago |
|
chenzhi
|
dc171af556
|
分控新增与解除操作日志
|
5 years ago |
|
chenzhi
|
97ff3baaff
|
优化操作日志下载
|
5 years ago |
|
chenzhi
|
7141e3752e
|
优化操作日志基函数
|
5 years ago |
|
zhengyongxing
|
3f4f39e238
|
封装时间函数
|
5 years ago |
|
zhengyongxing
|
756b3b9975
|
操作日志公用函数移到extend.php中
|
5 years ago |
|
liuweiwen
|
02920aab8a
|
资源审核配置列表、新增、编辑、删除、锁定、解锁
|
5 years ago |
|
chenzhi
|
f0d298c042
|
公会统计新增团体类型
|
5 years ago |
|
zhengyongxing
|
be932b1ebd
|
奖罚管理bug修改
|
5 years ago |
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
3c44d5d200
|
upt
|
5 years ago |
zhengchanglong
|
99f62f3c14
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
zhengyongxing
|
0cbd58862e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
955a1917b3
|
生成个人结算单的功能完成
|
5 years ago |
|
zhengchanglong
|
cb5cef678d
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengyongxing
|
56ecea6998
|
下游个人结算单生成代码上传
|
5 years ago |
|
zhengchanglong
|
254d29f3f2
|
测试订单录入
|
5 years ago |
|
liuweiwen
|
dfd198e9b7
|
对账系统增加奖罚数据
|
5 years ago |
|
zhengyongxing
|
77463c7e1d
|
市场结算管理上游流水符号修正
|
5 years ago |
|
liuweiwen
|
51d2d91671
|
验证手机号码格式修改
|
5 years ago |
chenzhi
|
39c43c1bee
|
优化游戏分成比例获取函数备注
|
5 years ago |
|
zyx
|
414d36c373
|
cp分成比例方法修正
|
5 years ago |
|
zyx
|
782de31ca8
|
cp分成比例方法添加
|
5 years ago |
|
zyx
|
f58f05d00d
|
cp分成比例方法修正
|
5 years ago |
|
zyx
|
4be5b1ba2c
|
cp分成比例方法添加
|
5 years ago |
chenxiaojun
|
10665cc869
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
|
liuweiwen
|
6f7dcb9ca5
|
修改上下游对账单导出文件名
|
5 years ago |
|
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
zhengyongxing
|
7f99dafb2c
|
市场结算管理 上游结算流水bug修正
|
5 years ago |
|
liuweiwen
|
1e4b7f69d5
|
cp/工会对账系统
|
5 years ago |
|
liuweiwen
|
21ee77609c
|
cp/工会对账系统
|
5 years ago |
|
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
zhengyongxing
|
ea140a430f
|
导出模板方法上传
|
5 years ago |
|
zhengyongxing
|
ba158e6b9a
|
市场结算管理上传
|
5 years ago |
|
liuweiwen
|
50320be1d2
|
新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
|
5 years ago |
|
zhengyongxing
|
89883d2005
|
新增市场结算管理
|
5 years ago |
|
zhengyongxing
|
13f5128dd8
|
支付渠道统计导出bug修正,游戏充值充值方式检索修正
|
5 years ago |
|
chenzhi
|
82afa60d12
|
优化玩家列表导出2
|
5 years ago |
|
chenzhi
|
d3ccc3bb5b
|
暂存
|
5 years ago |
|
chenzhi
|
9b7f3d1104
|
优化csv导出默认为不转码
|
5 years ago |
|
chenzhi
|
9d89be4527
|
优化公司游戏名游戏类型关系检索
|
5 years ago |
|
chenzhi
|
cf89e73281
|
优化csv导出函数
|
5 years ago |
|
zhengchanglong
|
ab5f7267e5
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenzhi
|
629c733742
|
删除函数重复问题
|
5 years ago |
|
chenzhi
|
0ef4241570
|
合并statistcs
|
5 years ago |
|
liuweiwen
|
2e818c04f8
|
登录记录搜索
|
5 years ago |
|
zhengchanglong
|
484972e9f2
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhengyongxing
|
b8859837fb
|
登录数据权限数据
|
5 years ago |
|
liuweiwen
|
2096c22826
|
注释
|
5 years ago |
|
liuweiwen
|
86dd4a2952
|
【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
|
5 years ago |
|
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
zhengchanglong
|
dbaf93b630
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
c5dc3b4f22
|
优化会长统计导出1
|
5 years ago |
|
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
chenzhi
|
b743cd73e1
|
新增导出csv函数
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
liuweiwen
|
fe5ae6a499
|
搜索的推广员数据权限
|
5 years ago |
|
chenxiaojun
|
5034cb863b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
ce0e9f943d
|
数据权限bug修正
|
5 years ago |
|
chenxiaojun
|
aa5e404188
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
7c7ec4fc1d
|
Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
liuweiwen
|
62f5098df7
|
处理数据权限筛选时，不覆盖原有的搜索字段promote_id
|
5 years ago |
|
chenxiaojun
|
cf8f6d007f
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
|
5 years ago |
|
zhanglingsheng
|
3b444155d8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
09ba38fc79
|
超级签统计
|
5 years ago |
|
chenxiaojun
|
f2fc739db2
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
bd8c4331bd
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenzhi
|
ff04347526
|
公会统计1
|
5 years ago |
|
zhanglingsheng
|
6ddf42181c
|
游戏查询联动
|
5 years ago |
|
zhengyongxing
|
6dc8366018
|
数据授权修改内容提交
|
5 years ago |
|
zhengchanglong
|
732ba257ec
|
修改身份证加密显示方式
|
5 years ago |
|
zhengchanglong
|
8a241cceb8
|
修改身份证加密显示方式
|
5 years ago |
|
liuweiwen
|
de7d34576d
|
添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
|
5 years ago |
|
liuweiwen
|
42ccd44de3
|
Merge branch 'dev_lww' into dev_permission
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/MendController.class.php
# Application/Admin/Controller/PromoteController.class.php
# Application/Admin/Model/MemberModel.class.php
|
5 years ago |
|
chenzhi
|
ff6c70e380
|
合并cz
|
5 years ago |
|
liuweiwen
|
42881595aa
|
获取当前管理员有权限查看所有推广员id
|
5 years ago |
|
zhengchanglong
|
6851933966
|
新建分支
|
5 years ago |
|
chenzhi
|
db6131a135
|
暂存
|
5 years ago |
|
zhengchanglong
|
d265c9b03f
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
chenzhi
|
af593e4326
|
优化首页折线统计统计方式
|
5 years ago |
|
yulingwei
|
2ab47c0864
|
充值方式修改
|
5 years ago |
|
yulingwei
|
be33c5c471
|
更新
|
5 years ago |
|
chenzhi
|
b52113622d
|
[bug]无法获取上线推广员问题
|
5 years ago |
|
yulingwei
|
24d3e6ab07
|
修改bug
|
5 years ago |
|
yulingwei
|
046beee6be
|
修改bug
|
5 years ago |
|
zhanglingsheng
|
a514e5b5dc
|
支付方式添加快捷
|
5 years ago |
|
zhanglingsheng
|
e07e1ff2aa
|
支付方式添加快捷
|
5 years ago |
|
chenxiaojun
|
2e7ecfa53c
|
管理后台--更新
|
5 years ago |
|
yulingwei
|
6ea4c72416
|
修改部分导出报表问题
|
5 years ago |
|
jbrazz
|
5deb0c2b05
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
8a513767dd
|
upt
|
5 years ago |
|
chenxiaojun
|
6307625efc
|
管理后台->推广员->结算管理->推广提现->--更新
|
5 years ago |
|
jbrazz
|
0dcb2a2014
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c9996e071c
|
fix grand_id
|
5 years ago |
|
ELF
|
831456b333
|
解决冲突
|
5 years ago |
|
jbrazz
|
9300280f78
|
merge feture/ylw
|
5 years ago |
|
jbrazz
|
5e9cfb023f
|
uypt
|
5 years ago |
|
jbrazz
|
48b1cdf66f
|
upt
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |