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

2103 Commits (dae421270f9d932701e72ee23b5f5d5982f4c486)

Author SHA1 Message Date
chenzhi 5ebdda1c85 修改合作方可为空
sunke a4377c017e 支付设置
chenzhi 50462e3470 优化合作方必填项
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家
chenzhi 673e3fb5cd 角色权限修改状态提醒优化
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 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
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
zhengyongxing c58cdd31af 用户行为日志导出修正
zhengyongxing 613d60e4a7 数据权限配置修改
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
新增权限不验证
chenzhi 973f7ca394 现在权限不验证
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
聚合财务结算单
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 行为日志修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi afd362d847 聚合结算单导出优化3
chenzhi 2fc38b25b6 聚合结算单导出优化2
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
chenzhi 73ac725950 聚合脚本ok
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
ELF 908722c5be 修改
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
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 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 aa14aa95a6 平台
sunke b6649a7b9d 平台币
yulingwei ccc159d3b2 upt
yulingwei 42026e753a upt
yulingwei 7b3006f871 upt
yulingwei 5009a327db upt
yulingwei f1428a8fe7 upt
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 253c956794 平台币
sunke 2adcb68c06 平台币新增需求
sunke 97e8397d76 文件夹优化
sunke 1fe794b597 平台规则样式优化
sunke ec309c2b6a 规则
sunke bdb688c985 编辑规则
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填
yulingwei c1d03cc526 upt
yulingwei 9d6bf8225a upt
yulingwei 007374e121 upt
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
添加tf礼包
sunke ce2408576c 充值方式统计匹配支付渠道
sunke 6cc33a7fe8 导出顺序
sunke 15f6cb19a3 渠道支付顺序
ELF 2a2e5f0d31 添加tf礼包问题
张谷诚 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修正，支付意愿统计功能优化
chenzhi 14ffc00f86 优化权限处理
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录
chenzhi b1701889c4 优化财务比较金额不符规则
chenzhi 5ddf75a600 财务对比ok
chenzhi b2ad4e8b6e 财务对比 v1
chenzhi a2db46d1c0 财务对比首页
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi 79f4719dec 财务对比7
chenzhi c4eb963cfe 财务比对5
zhengyongxing 573e580778 支付渠道详情检索修正
zhengyongxing bba97196ec 支付渠道详情检索修正
zhengyongxing 2fab9d3ef9 支付渠道详情统计bug修改
zhengyongxing 45847a8194 支付渠道详情统计bug修改
chenzhi 6abef9385e 优化测试服订单导出
chenzhi 202f9a45d1 财务对比4
zhengyongxing e34c553358 支付渠道统计bug修改
zhengyongxing 8d742886a7 支付渠道统计bug修改
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
chenzhi ea69ecb086 财务比较2
zhengyongxing a7838bb552 Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
zhengyongxing e445108eb6 支付渠道统计修改
chenzhi 6f7e0de83d 优化平台币设备，名称
chenzhi 6c8f935170 支付渠道
chenzhi 751357feef 优化导出
chenzhi 48e5e4d824 财务对比1
chenzhi ce1d15c602 优化游戏订单导出
廖金灵 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 市场结算管理优化
sunke d31f5c8691 位数
sunke 55316d475f 限额
sunke 163ad97d60 支付限额
sunke 817b39c391 支付限额
sunke 56b5144440 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release 
推广员内外团归属优化
sunke 19af71ce72 支付限额
sunke 68572d10e6 支付限额
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化
sunke dfb83d35d0 时间样式
ELF ef56ea2180 修改
ELF fb6a00859e 修改会长押金需求
sunke 4f98f9fabe 样式控制
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开
zhengyongxing 4ce89ee670 支付白名单列表功能完善
zhengyongxing 6b8f9a47d0 Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list
zyx fc9fa629ae 游戏充值bug修改
zhengyongxing ad08aeeace 支付意向统计代码提交
sunke c8b3cb87d8 支付限额
sunke ac54bb41a4 支付限额导出
sunke 5c8221d9dc 支付限额
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 121fc02f18 推广员内外团归属优化2
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化
chenzhi 55d49e8b4b 优化推广公会列表导出
ELF 4a1ffd2955 解决冲突
chenzhi f2148320a8 新增公会旧数据归属刷新脚本
chenzhi 61d0418340 推广公司管理 修改内外团影响底下
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化游戏统计弹框时间错误问题
chenzhi 82aa4f762b 优化游戏统计弹框时间错误问题
chenzhi d7737291ed 暂存1
sunke e7397e38b9 ios
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release 
修复检索问题
yulingwei c40f5dda26 upt
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
sunke 49efb2e60f xiufu
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form 
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
zhengyongxing 87b1b04040 充值财务管理金额保留小数点
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release 
导出问题修复
yulingwei eca43f471d upt
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源bug修正
zhengyongxing 3b58c877c4 测试资源配置状态添加
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源定时脚本修正
sunke 7194cd49ae 平台币
zhengyongxing 61b5fb48b6 测试资源配置状态添加
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip限制白名单苹果内购限制总开关去除
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip限制白名单提示语修改
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log 
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit 
 Conflicts:
	Data/update.sql
sunke e0d8539ea0 ex
sunke 35f5cc03bb value_detail
sunke e94c64a881 平台币统计
廖金灵 3be1bd78ed Merge branch 'feature/work_order' of wmtx/platform into release 
工单管理
yulingwei 26f89f3c64 merge
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release 
修改下载统计bug
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release 
玩家列表新增去重数据栏
zhengyongxing c3adec70ec ip限制白名单提交
sunke 7da471b6ee 支付时间
yulingwei 8e7dd34b92 upt
yulingwei adf11e2b60 upt
yulingwei fc3b7be03e upt
yulingwei 175502e384 fix
zhengyongxing 5d81a253db ip限制控制器提交
yulingwei b10717e8b6 upt
zhengyongxing 80d48600f7 Merge remote-tracking branch 'origin/fix/admin_second_optimization' into fix/admin_second_optimization
zhengyongxing e63c52ba2c 市场结算管理，定时器完成
chenzhi bfee0578d0 玩家列表新增去重数据栏
chenzhi 52c78bb835 优化统计-统计-推广员统计
yulingwei ead4a8598e upt
chenzhi c61f750549 优化新增推广员员时手机号错误问题
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度
zhengyongxing d5561209fd 管理后台日志唯一键值bug修改
zhengyongxing 958fb41227 管理后台日志唯一键值修改
廖金灵 e885a75d1d Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化游戏统计及公会统计打开速度
chenzhi 381327ae21 优化游戏统计
chenzhi a33bf22e52 优化弹框
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题
chenzhi 27d4e7835d 优化公会统计索引1
廖金灵 9b6d2a72d9 Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化用户列表统计数据
yulingwei cf0762cb9c upt
yulingwei 315ebb2152 upt
chenzhi 71530c53e3 优化公会统计内充详情不符问题
chenzhi 02d36af96a Merge branch 'feature/add_opertion_log' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
chenzhi d64895896f 优化公会统计默认值
zhengyongxing e31138b5a5 测试白名单bug修改
chenzhi 45cad05508 优化用户列表统计数据
ELF dae2dd5fd9 优化游戏
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei 4caa02a76b upt
yulingwei b8fda2417a 工单管理
sunke 389ef7e967 bug修复
ELF b81842e6e0 解决冲突
sunke 098c63d63d 支付渠道优化
zhengyongxing 141bdf561a 支付渠道添加索引
sunke 2ecb05d924 支付渠道统计
sunke 3edb0640ed 新增管理后台测试订单导出功能
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
zhengyongxing 3302015365 行为日志增加修改绑定推广员操作
zhengyongxing 4ee6146a49 Merge branch 'feature/user_repeat' into release
zhengyongxing c6eef5124d 测试资源修改
zhengyongxing 7f0c883904 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 11f8434215 Merge branch 'feature/user_repeat' into release
zhengyongxing a2312d9eaa 用户去重bug修改
zhengyongxing 443abed206 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 19d85f3717 测试资源可用余额接口修改
chenzhi 8fdcf88825 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi 3cbf6c5a39 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi fac54ad10d 优化绑币收回内存
zhengyongxing 15cd1b51da Merge branch 'feature/user_repeat' into release
zhengyongxing 1a6282c52c 测试资源可用余额接口修改
zhengyongxing caddcd1543 日志管理删除url开启
zhengyongxing 14c3d365e3 Merge branch 'feature/user_repeat' into release
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服
zhengyongxing ffd6238bc1 测试订单bug修正
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证
chenzhi fd7dc828bd Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release