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

2368 Commits (16f8bead316ba8a9af4a95ea07bc8320a83bfbab)

Author SHA1 Message Date
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断
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
zhengyongxing 83717b64ae 市场专员业绩管理优化
chenzhi 5fc03a14a4 优化cp添加
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交
chenzhi d52ab03714 新增推广公司游戏选择
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release 
修改换绑bug
ELF ecc228409d 修改
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release 
推广员充值换榜定时器优化
zhengyongxing 3128c079d3 推广员充值换榜定时器优化
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化
chenzhi bc75da8c14 解决冲突
zhengyongxing 15b9efcd7e 江息网络漏掉的修改
zhengyongxing 1234349844 市场专员业绩计算修改
chenzhi f62cfca22b 隐藏推广公司分成比例
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
chenzhi 21a738054a 隐藏推广公司比例
zhengyongxing 39e2bce6dd 推广员充值统计提交
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交
ELF 990a2bd206 解决冲突
chenzhi a020cb26df 新增不验证手机 己方
chenzhi 91ae987c3c 优化游戏比例分成无需大于
ELF 7c3a001e25 修改
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制
zhengyongxing 682ce333b1 市场结算管理公司税率提交
chenzhi c76cf038cd 己方公司
ELF e94b6418f1 修改
ELF 8224cfb362 修改
ELF 77c692c44d 修改
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
zhengyongxing 2fae4219df 公会统计去除
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
zhengyongxing cd0d9e295f 市场专员结算代码上传
zhengyongxing 379716298a 市场专员结算代码上传
ELF e3b53e7df1 修改
ELF 73f5f4f5ea 修改
ELF 38c10a0f7a 修改
ELF 10aed50db7 修改
ELF f9b054e1cb 修改
ELF f0a8b6bc3b 修改
ELF 6f2f588617 优化
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
zhengyongxing a2408407b7 上传市场专员结算代码
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release 
task440
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release 
取消测试的虚拟验证码
chenzhi 7d8dca7421 取消测试的虚拟验证码
chenzhi 95d9f45612 新增检索
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release 
汇付宝
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17
yulingwei 8c18f2aa1d 1
ELF 2d872ed710 解决冲突
ELF 2589806e62 解决冲突
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17
yulingwei 0decb03cb1 merge
ELF a153fb9a0e 修改
yulingwei 5b604ab073 upt
chenzhi ca551b9c50 己方公司新增搜索项目
chenzhi c335c1f0b3 优化补点和月结集合
chenzhi bffc9a32f1 数据迁移
chenzhi 26ccc9c450 优化导出权限
chenzhi e96c6e8b52 公司获取优化
chenzhi 511f53e83c 优化权限
chenzhi d845ab35a3 优化新增结算
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
chenzhi 4b29d159e1 取消备注
zhengyongxing b664ba46ad 汇总单代码提交
chenzhi 6c05756415 新增排序
chenzhi 9d8ed80fcc 优化新增重算
chenzhi 53b9513935 新增结算
chenzhi 53004adf5d 新增打款
chenzhi a2454e0446 取消结算单下游个人导出
zhengyongxing 9d43914b17 汇总单结算代码上传
chenzhi 0ba02069a0 优化补点计算方式
chenzhi ec641257b0 优化下游渠道结算
chenzhi fdccc92c43 新增只支持脚本访问
chenzhi 38ab488cd0 修复搜索错误
chenzhi 036a710f2f 修复不修改不重审
chenzhi a9723597f0 优化推广比例未修改重审
zhengyongxing f7f862fd83 官方渠道修改江息网络
yulingwei e09296d10d upt
chenzhi 265384f2c8 优化审核乱跳
chenzhi 994ee29b1d 优化审核列表乱跳
chenzhi ffb60d80a9 修复多家公司合作问题
chenzhi 701c421d0c 上级改为通知成功
chenzhi 31ef129b2d 修复己方公司不能删除
chenzhi ffee256f93 优化bug1
chenzhi d5aeb21b33 新增结算周期读取
chenzhi 553d9b0f91 新增分成生效模板
chenzhi af1829c124 新增打款详情
yulingwei 99fcc4cbbb upt
zhengyongxing 2ce274486d 官方渠道修改江息网络
ELF 522f758bd5 修改
zhengyongxing 8dd071ecc7 市场结算定时器优化
chenzhi 3611e4855d 合并冲突
zhengyongxing edbd6f46a3 市场结算定时器找回
ELF e5a21b9224 修改
yulingwei 0472fe9cbc upt
chenzhi c7c67f279a 打款信息查看
chenzhi 3ef24c2c57 新增打款信息编辑
chenzhi 1f155020d4 新增是否允许打款
zhengyongxing 9aed64f46d 推广员充值汇总优化，补单功能添加
ELF 486b5e1f83 优化curl
ELF dc85bdb631 添加批量删除推广限制功能
ELF 69b09c582f 添加落地页限制规则
chenzhi 79a9a8c68c 新增重算
chenzhi d05d6e2159 新增导出
chenzhi 3b8d6eb128 新增导出
yulingwei 93601a3302 upt
chenzhi 88c70c29db 新增0不查看
yulingwei e6c8b51127 upt
chenzhi 547b512ead 暂存
yulingwei bbb7cb23f6 upt
yulingwei 3530456cfa upt
chenzhi 0f632f386b 下游个人聚合
yulingwei f969802c26 upt
廖金灵 a4d86b4fdd Merge branch 'feature/promote_statistics' of wmtx/platform into master 
推广员充值统计添加默认时间
chenzhi 7d3e90514f 新增个人聚合
chenzhi f2ce52ada5 暂存
zhengyongxing 711f98ef86 推广员充值统计添加默认时间
廖金灵 22e5fe8d76 Merge branch 'hotfix/pack_package' of wmtx/platform into release 
优化打包
ELF 1c3bb3604e 优化打包
廖金灵 6a8f1a517f Merge branch 'hotfix/pack_package' of wmtx/platform into release 
优化打包
ELF 4f8f18a680 优化打包
廖金灵 154a0115dc Merge branch 'hotfix/pack_package' of wmtx/platform into release 
优化打包
ELF 29595ff5d9 优化打包
zhengyongxing 4352b0c733 将官方渠道修改为江息网络
廖金灵 bd8842759e Merge branch 'hotfix/pack_package' of wmtx/platform into release 
优化打包
ELF 02259ae330 修改bug
ELF 769193883d 修改bug
ELF d5d6c255b0 优化打包
yulingwei 6ada5711ab upt
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi dff3542fdd 新增个人信息获取
zhengyongxing 6da0ec1607 用户列表修改提交
chenzhi c6f4149d6a 修改下游个人聚合
chenzhi a3633ea52e 新增下游查看导出
廖金灵 b62eb3be7c Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release 
隐藏市场总监电话
chenzhi 7ac118c024 下游公司查看
chenzhi 7a5c42eb5e 上游导出优化
chenzhi 427d6457fc 上游查看及导出
chenzhi eeec8b13f2 cp查看
chenzhi 4e4da92420 优化比例
chenzhi 2cf0fdf905 新增公会归属编辑规则修改
chenzhi 22aa5d3dd4 暂存
zhengyongxing f08c0cec9b 苹果beta包添加测试ip白名单
chenzhi 02e7d85e44 优化生成结算单
chenzhi bf24f9bc9d 开户网点该帐户名
chenzhi f7d67ff4c4 新增合作方阿里账号及用户
chenzhi cd0ff2ef8a 暂存
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单
chenzhi 466f1f4680 汇总提交ok
chenzhi c39da62037 新增是否打款
chenzhi e1d624fe8b 优化导出并聚合数据
chenzhi 903fc71255 新增补链账号错误
chenzhi 8bfe249251 新增备注
chenzhi c5e3d78835 新增导出
chenzhi 1d92fdb1db 新增重算接口
chenzhi e80d4eb539 新增确认
chenzhi 93a8bb70e1 新增编辑
chenzhi 669bfa8f25 暂存
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Data/update.sql
chenzhi 6162f9f8a1 生成上下游结算单
chenzhi 380243dbb8 优化结算的补点
chenzhi 4c0c51e0ae 上游结算ok
chenzhi fe7d21943b 暂存2
chenzhi c71c142227 暂存
chenzhi b4c93cc433 接口还原分离
chenzhi c59a314afe 优化聚合cp获取接口
sunke 51551e91df Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary
zhengyongxing 394ce7a544 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit
zhengyongxing 9aae41fd20 ip封禁隐藏区域
chenzhi 5c1a8d69a0 新增生效列表页面
chenzhi 8a508c050d 新增编辑
chenzhi 4b8538a3bb 新增审核操作
chenzhi f20cfde7c7 新增审核列表导出
chenzhi e684191b45 优化审核列表
chenzhi b5a604d385 优化添加
chenzhi e5dc86118e 新增优化
chenzhi 1139b37a50 新增公司关系绑定
chenzhi 3b8e7eb2b0 推广游戏分成管理ok
chenzhi a8fddb8f2f 优化游戏分成
chenzhi 0d8ec00225 优化排序
chenzhi 8a83e17485 新增导出
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 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 3b6f8c70cc 优化可以为空填写
chenzhi ba9468fedc 新增打款配置
廖金灵 d99db944c5 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master 
bug修复及cp下游接口添加
chenzhi 748ec401f3 新增打款配置1
chenzhi 6c4319cfe2 Revert "暂存" 
This reverts commit a685c14e23.
chenzhi a685c14e23 暂存
chenzhi ec4d180287 优化公会更改
chenzhi 09e71420e0 优化推广员归属审核
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
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修改