elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,413 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

2682 Commits (dbad9a08dbf0bec1eac8bc5264a2a903ba2805c6)

Author SHA1 Message Date
chenzhi 4533b84d2c 权限
zhengyongxing 0953eb4dd4 Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms
chenzhi 6a3b9b6da3 新增游戏分成比例
chenzhi 1c8ef3493d 优化比例模板
chenzhi c1283ebfeb 游戏比例模板导出删除
chenzhi adbc76c3ae 游戏模板修改
chenzhi 3a8273283e 游戏比例模板新增
万盟天下 04178efac9 Merge branch 'hotfix/admin_three_optimization' of wmtx/platform into release 
优化合作公司列表显示
chenzhi 9c1a12296d 优化合作公司列表显示
chenzhi 6c6dddf6ac Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
chenzhi 982a7f4c1b 更新合作公司列表显示
chenzhi fd4e0baffd 新增游戏比例模板
zhengyongxing a4cbd2e314 开户网点推广公司查询添加
zhengyongxing fba271cd64 Merge branches 'fix/admin_second_optimization' and 'master' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
chenzhi 8b9a4e73fe 接口数据1
zhengyongxing 1c5a02594a 身份认证后台添加
chenzhi e84d545a2d Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
zhengyongxing e949f92434 ip限制操作日志添加
廖金灵 2d7189a224 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master 
优化空值修改
chenzhi 42a9b318fb 优化空值修改5
chenzhi 4ebe2780cc 优化空值修改4
chenzhi 644e38fd1f 优化空值3
chenzhi 644100dc3b 优化空值修改2
chenzhi 3b6f8c70cc 优化可以为空填写
chenzhi ba9468fedc 新增打款配置
廖金灵 d99db944c5 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master 
bug修复及cp下游接口添加
chenzhi 748ec401f3 新增打款配置1
sunke bb9654f09f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/loginInfo
廖金灵 08f068b553 Merge branch 'fix/admin_second_optimization' of wmtx/platform into release 
修改查看
chenzhi 6c4319cfe2 Revert "暂存" 
This reverts commit a685c14e23.
chenzhi 42a17754e4 修改查看
chenzhi a685c14e23 暂存
廖金灵 e39ab6806e Merge branch 'fix/admin_second_optimization' of wmtx/platform into release 
bug修复及cp合作方获取接口添加
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization
chenzhi ec4d180287 优化公会更改
chenzhi 09e71420e0 优化推广员归属审核
sunke 2a017bfb45 loginmodel
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
chenzhi 5ebdda1c85 修改合作方可为空
sunke a4377c017e 支付设置
zhengyongxing 1f0cfca3ce 管理后台推广公司管理及合作方管理部分文字修改
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改
chenzhi 50462e3470 优化合作方必填项
chenzhi e770a00cbb 优化推广公司必填项目
chenzhi 9f7e15caac 优化推广公司检验规则
chenzhi c3f01ede43 推广公司新增信息填写无效修复
zhengyongxing 2933d2d223 管理后台文字修正
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家
chenzhi 673e3fb5cd 角色权限修改状态提醒优化
chenzhi 6885ec61fc 优化公会统计平台币收回提醒
chenzhi 289b99c293 合作方管理页面文字错误
chenzhi c93a8577c4 合并
张谷诚 bb833deb98 Merge branch 'hotfix/test_resource_search' of wmtx/platform into master 
测试资源搜索功能添加
chenzhi ae4c58b6fd 修改推广员流水可选填
zhengyongxing 132b601f74 测试资源搜索功能添加
zhengyongxing 878414aeb2 测试资源搜索修正
张谷诚 c5f9a25a9e Merge branch 'feature/export_authority' of wmtx/platform into release 
导出bug修改
zyx ee9f53ce0b 导出权限bug修改
zhengyongxing 301a5a7f5a 导出bug修改
zhengyongxing 5e71728097 导出bug修改
chenzhi 450ef803d6 合并
chenzhi 3e7778df35 优化零元问题
chenzhi 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
廖金灵 52b483356d Merge branch 'feature/export_authority' of wmtx/platform into release 
游戏统计bug修改
zhengyongxing 6081e088db 游戏统计bug修改
chenzhi 0dab114f1e 优化操作提醒
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' of wmtx/platform into release 
游戏统计导出修改
廖金灵 3e43b8cb7c Merge branch 'hotfix/company_bank' of wmtx/platform into release 
优化银行信息不记录
chenzhi 14efc9650f 优化银行信息不记录
zhengyongxing 1659c55ef2 用户行为日志修改
zhengyongxing 0ca2f2a064 游戏统计导出修改
chenzhi 2ad89c2fb6 优化导出时间
chenzhi 5a9fc76374 申请编辑信息遮罩不关闭
zhengyongxing 4d43e877a1 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority 
 Conflicts:
	Data/update.sql
zhengyongxing acaebe0217 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority 
 Conflicts:
	Data/update.sql
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
chenzhi 22dc7a62ce 优化游戏统计导出游戏类型不识别
chenzhi 496d6a27bb 优化推广员选择后驻留问题
chenzhi 7fa6baf860 玩家登陆显示优化
zhengyongxing c58cdd31af 用户行为日志导出修正
zhengyongxing 613d60e4a7 数据权限配置修改
zhengyongxing 057a51dbeb 游戏统计bug修正
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
新增权限不验证
zhengyongxing 81bd79ecf8 游戏统计bug修正
chenzhi 973f7ca394 现在权限不验证
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
聚合财务结算单
zhengyongxing 4b63c7b786 游戏统计bug修正
chenzhi 21a985ae82 聚合财务结算单ok
zhengyongxing 4f88cd025e 绑币导出修正
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 38f478d63d 数据调整修改
zhengyongxing 8d7dbe5469 测试资源修改
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
zhengyongxing 5dbd0eb8fa 业绩配置修改
zhengyongxing a9ce0585cc 测试资源配置
chenzhi 2a28cf9008 聚合财务优化权限
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority 
 Conflicts:
	Application/Home/Controller/PackageController.class.php
chenzhi fe662ce160 审核子操作ok
zhengyongxing b6b97c130d 测试资源代码修正
chenzhi 16d9813e18 聚合财务重算
zhengyongxing a9e6dafad3 行为日志修正
zhengyongxing b698495dbb 游戏统计添加元素修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi afd362d847 聚合结算单导出优化3
chenzhi 2fc38b25b6 聚合结算单导出优化2
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
ELF 4a92ab8543 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/web_register
zhengyongxing 13232b3b04 获取用户账号接口
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
ELF d9cc82f73a 修改网站注册
chenzhi 73ac725950 聚合脚本ok
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加
ELF 0af6a53ba7 后台arpu功能优化
chenzhi 95cd9993e2 聚合财务1
zhengyongxing 941f27e2e3 获取用户账号的方法添加
zhengyongxing 4d938b85f4 导出账号权限修改配置
zhengyongxing 0482836a8e 导出账号权限添加
zhengyongxing a5554f7fa3 推广员业务配置功能添加
zhengyongxing 295ca2d803 推广员业务配置功能添加
万盟天下 aa663b3c02 Merge branch 'release' of wmtx/platform into master 
优化游戏管理
ELF 144e4e4ea7 计算ARPU
万盟天下 c292e9ed6c Merge branch 'feature/promote_all_check' of wmtx/platform into release 
推广员游戏列表查看全选问题修正
ELF 908722c5be 修改
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 322b4b6cee 管理后台导出权限添加
zhengyongxing 001e9e70f8 管理后台导出权限添加
廖金灵 a6dffecaf9 Merge branch 'feature/fix_work_order' of wmtx/platform into release 
修复统计问题
yulingwei 8fc1199e79 upt
yulingwei 70f3da8017 upt
廖金灵 7ab6c8ad68 Merge branch 'feature/fix_work_order' of wmtx/platform into release 
修复问题
yulingwei 2ac6f7ebee upt
yulingwei c3cb357e1c upt
廖金灵 b09ccfc42d Merge branch 'feature/fix_work_order' of wmtx/platform into release 
修复问题
yulingwei 872a76356d upt
廖金灵 820885f3dd Merge branch 'feature/platform_rule' of wmtx/platform into release 
推广规则
sunke bde08adcc2 平台币
廖金灵 8b2ae9d6da Merge branch 'feature/fix_work_order' of wmtx/platform into release 
工单统计及iOS下载数优化
廖金灵 72d1d2f338 Merge branch 'feature/president_modify' of wmtx/platform into release 
修改会长押金编辑付款人付款账号非必填
sunke 163388e75c 平台币
sunke ae0e10166a pt
sunke 07c385e561 平台
sunke 0758921bfe 平台
sunke aa14aa95a6 平台
sunke 848eb6c294 平台
sunke b6649a7b9d 平台币
yulingwei ccc159d3b2 upt
yulingwei 42026e753a upt
yulingwei 7b3006f871 upt
yulingwei 5009a327db upt
yulingwei ac83e556ff upt
yulingwei f1428a8fe7 upt
sunke 031528411b 平台币
sunke 5fa22cfa40 弹窗
sunke fee97bb00a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
yulingwei dec978da7a upt
yulingwei e462305587 upt
yulingwei 312448c724 upt
sunke c1168740b6 平台币
sunke 253c956794 平台币
sunke 2adcb68c06 平台币新增需求
sunke 97e8397d76 文件夹优化
sunke 1fe794b597 平台规则样式优化
sunke ec309c2b6a 规则
sunke bdb688c985 编辑规则
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填
yulingwei c1d03cc526 upt
yulingwei 9d6bf8225a upt
zhengyongxing 541ec17db5 隐藏威富通添加汇付宝
yulingwei 007374e121 upt
廖金灵 bf701babb7 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
隐藏礼包数量
ELF 41e1801550 修改手机登录bug
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
添加tf礼包
sunke ce2408576c 充值方式统计匹配支付渠道
sunke 6cc33a7fe8 导出顺序
sunke 15f6cb19a3 渠道支付顺序
ELF 2a2e5f0d31 添加tf礼包问题
sunke b4e66dcd40 隐藏推广配置
张谷诚 c5af3c29d7 Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release 
支付渠道测试订单录入bug修正，支付意愿统计功能优化
廖金灵 9f202c3991 Merge branch 'feature/finance_compare' of wmtx/platform into release 
财务导入对比
chenzhi 9237bc3cc8 优化选择
chenzhi abf43566e4 调整参数
廖金灵 86a90467ff Merge branch 'feature/president_apply' of wmtx/platform into release 
修改会长押金需求
zhengyongxing d4aafd2983 支付渠道测试订单录入bug修正，支付意愿统计功能优化
yulingwei 6f7d285f9f 修复资源工单完成情况
chenzhi 14ffc00f86 优化权限处理
chenzhi c0df7f23c3 优化高亮
zhengyongxing dc5437d7cb 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录
chenzhi b1701889c4 优化财务比较金额不符规则
chenzhi 5ddf75a600 财务对比ok
chenzhi b2ad4e8b6e 财务对比 v1
chenzhi a2db46d1c0 财务对比首页
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi 79f4719dec 财务对比7
chenzhi c4eb963cfe 财务比对5
zhengyongxing de646044c2 支付渠道详情检索修正
zhengyongxing 573e580778 支付渠道详情检索修正
zhengyongxing bba97196ec 支付渠道详情检索修正
zhengyongxing 2fab9d3ef9 支付渠道详情统计bug修改
zhengyongxing 45847a8194 支付渠道详情统计bug修改
zhengyongxing e51cad19eb Merge remote-tracking branch 'origin/hotfix/finance_game_name_change_2' into hotfix/finance_game_name_change_2
zhengyongxing e7e7df569b 支付渠道统计bug修改
chenzhi 6abef9385e 优化测试服订单导出
chenzhi 202f9a45d1 财务对比4
zhengyongxing e34c553358 支付渠道统计bug修改
zhengyongxing 8d742886a7 支付渠道统计bug修改
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi 33be2ba05b 优化游戏统计平台币直充搜索后数据不符合问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
chenzhi eaa51463e5 公会统计
chenzhi ea69ecb086 财务比较2
zhengyongxing a7838bb552 Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
zhengyongxing e445108eb6 支付渠道统计修改
张谷诚 13c352a924 Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿a标签悬停变成手势
chenzhi c45ca2942d 优化设备名称函数
chenzhi 6f7e0de83d 优化平台币设备，名称
chenzhi 6c8f935170 支付渠道
chenzhi 751357feef 优化导出
chenzhi e0c946e67c 工会统计2
chenzhi b36515a720 工会统计
chenzhi 48e5e4d824 财务对比1
chenzhi ce1d15c602 优化游戏订单导出
zhengyongxing 4361b3c3ba 支付渠道意愿a标签悬停变成手势
廖金灵 d781d6825c Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计文字修改，及排序方式修正
zhengyongxing 674e727921 支付渠道意愿统计文字修改
张谷诚 170b116333 Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计bug上传
zhengyongxing 9eff370801 支付渠道意愿统计bug上传
张谷诚 e42281bdfe Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿统计bug上传
zhengyongxing f40bd57698 支付渠道意愿统计bug上传
廖金灵 985fdab851 Merge branch 'feature/limit_pay' of wmtx/platform into release 
支付限额
张谷诚 b9f466f73c Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付意向
支付限额白名单
zhengyongxing f7c9730153 市场结算管理优化