2333 Commits (c6b3d1948e8adb8834841d423f236e96eb67cbfe)

Author SHA1 Message Date
郑永星 c036175a14 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员筛选,月份跳转,及时间筛选修正
5 years ago
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正 5 years ago
elf@home fb87be0b43 修改 5 years ago
廖金灵 83a1f15de5 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
5 years ago
zhengyongxing cd208fbfd7 跳转汇总结算单默认事件添加 5 years ago
廖金灵 6f3a94a31b Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
5 years ago
zhengyongxing 19c2f8b2de 跳转汇总结算单默认事件添加 5 years ago
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正,添加筛选发放状态的代码
5 years ago
zhengyongxing ced9d51845 跳转汇总结算单跳转修正,添加筛选发放状态的代码 5 years ago
廖金灵 262940a42f Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员,其他人员的数据隐
5 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 5 years ago
廖金灵 1ec683a86e Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成市场总监管理组添加查看全部用户的权限
5 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 5 years ago
廖金灵 27f14f0292 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
5 years ago
zhengyongxing bded27756e 市场业绩提成bug修改 5 years ago
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
5 years ago
zhengyongxing 5ab96edd8f 市场业绩提成bug修改 5 years ago
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
5 years ago
zhengyongxing 5f113b8bfc 市场业绩提成优化 5 years ago
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
5 years ago
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正 5 years ago
郑永星 a9e8905e27 Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
5 years ago
zhengyongxing 3eeeb449de 提现汇总表时间检索bug修正 5 years ago
zhengyongxing 4e562ffcc4 提现汇总表时间检索bug修正 5 years ago
廖金灵 8ad5533c53 Merge branch 'feature/market_percentage' of wmtx/platform into release
汇率逻辑修改
5 years ago
zhengyongxing 0ac831dece 汇率逻辑修改 5 years ago
廖金灵 39af00fe0e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
5 years ago
ELF 2dadc11d09 修改bug 5 years ago
廖金灵 578087e50e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
5 years ago
ELF fa4de7ece5 修改 5 years ago
zhengyongxing 585f523984 arpu分析bug修正 5 years ago
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 5 years ago
zhengyongxing 3603f5fa21 市场专员业绩提成bug修正 5 years ago
zhengyongxing 944a424b3c 市场专员业绩提成bug修正 5 years ago
zhengyongxing 44feb6957d 市场专员业绩提成bug修正 5 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 5 years ago
zhengyongxing b9255647f7 市场专员业绩提成汇总单检索
修正
5 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 5 years ago
zhengyongxing 5c76d1180d 市场专员业绩结算结构修改 5 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 5 years ago
zhengyongxing 8053806801 市场专员业绩bug修改 5 years ago
zhengyongxing f7c11991ca 市场专员业绩bug修改 5 years ago
chenzhi 2a4541569d 优化列表显示 5 years ago
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time 5 years ago
chenzhi 63054ac0d8 优化订单校验 5 years ago
zhengyongxing de3d7d52b7 市场专员业绩计bug修正 5 years ago
chenzhi 04e13844c3 zancun 5 years ago
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage 5 years ago
zhengyongxing 043ee29f54 市场专员业绩计bug修正 5 years ago
zhengyongxing 8430444b8e 市场专员业绩计bug修正 5 years ago
zhengyongxing 2da9821caf 市场专员业绩计算修正 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing ea21948984 支付渠道bug修改 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 5 years ago
chenzhi c9d6b9859d 合并热更 5 years ago
chenzhi c18eb439c5 优化游戏获取逻辑 5 years ago
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 5 years ago
chenzhi 048931ce9e 优化搜索3 5 years ago
chenzhi 35380ae9b0 优化搜索2 5 years ago
chenzhi 587d7913ca 优化检索 5 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 5 years ago
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定 5 years ago
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断 5 years ago
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
5 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 5 years ago
chenzhi 5fc03a14a4 优化cp添加 5 years ago
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 5 years ago
chenzhi d52ab03714 新增推广公司游戏选择 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
5 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 5 years ago
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 5 years ago
zhengyongxing 1234349844 市场专员业绩计算修改 5 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 5 years ago
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
5 years ago
chenzhi 21a738054a 隐藏推广公司比例 5 years ago
zhengyongxing 39e2bce6dd 推广员充值统计提交 5 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
chenzhi a020cb26df 新增不验证手机 己方 5 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 5 years ago
ELF 7c3a001e25 修改 5 years ago
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制 5 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 5 years ago
chenzhi c76cf038cd 己方公司 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 5 years ago
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
5 years ago
zhengyongxing 2fae4219df 公会统计去除 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 5 years ago
zhengyongxing 379716298a 市场专员结算代码上传 5 years ago
ELF e3b53e7df1 修改 5 years ago
ELF 73f5f4f5ea 修改 5 years ago
ELF 38c10a0f7a 修改 5 years ago
ELF 10aed50db7 修改 5 years ago
ELF f9b054e1cb 修改 5 years ago
ELF f0a8b6bc3b 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing a2408407b7 上传市场专员结算代码 5 years ago
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
5 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
5 years ago
chenzhi 7d8dca7421 取消测试的虚拟验证码 5 years ago
chenzhi 95d9f45612 新增检索 5 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
5 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 8c18f2aa1d 1 5 years ago
ELF 2d872ed710 解决冲突 5 years ago
ELF 2589806e62 解决冲突 5 years ago
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 0decb03cb1 merge 5 years ago
ELF a153fb9a0e 修改 5 years ago
yulingwei 5b604ab073 upt 5 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 5 years ago
chenzhi c335c1f0b3 优化补点和月结集合 5 years ago
chenzhi bffc9a32f1 数据迁移 5 years ago
chenzhi 26ccc9c450 优化导出权限 5 years ago
chenzhi e96c6e8b52 公司获取优化 5 years ago
chenzhi 511f53e83c 优化权限 5 years ago
chenzhi d845ab35a3 优化新增结算 5 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 5 years ago
chenzhi 4b29d159e1 取消备注 5 years ago
zhengyongxing b664ba46ad 汇总单代码提交 5 years ago
chenzhi 6c05756415 新增排序 5 years ago
chenzhi 9d8ed80fcc 优化新增重算 5 years ago
chenzhi 53b9513935 新增结算 5 years ago
chenzhi 53004adf5d 新增打款 5 years ago
chenzhi a2454e0446 取消结算单下游个人导出 5 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 5 years ago
chenzhi 0ba02069a0 优化补点计算方式 5 years ago
chenzhi ec641257b0 优化下游渠道结算 5 years ago
chenzhi fdccc92c43 新增只支持脚本访问 5 years ago
chenzhi 38ab488cd0 修复搜索错误 5 years ago
chenzhi 036a710f2f 修复不修改不重审 5 years ago
chenzhi a9723597f0 优化推广比例未修改重审 5 years ago
zhengyongxing f7f862fd83 官方渠道修改江息网络 5 years ago
yulingwei e09296d10d upt 5 years ago
chenzhi 265384f2c8 优化审核乱跳 5 years ago
chenzhi 994ee29b1d 优化审核列表乱跳 5 years ago
chenzhi ffb60d80a9 修复多家公司合作问题 5 years ago
chenzhi 701c421d0c 上级改为通知成功 5 years ago
chenzhi 31ef129b2d 修复己方公司不能删除 5 years ago
chenzhi ffee256f93 优化bug1 5 years ago
chenzhi d5aeb21b33 新增结算周期读取 5 years ago
chenzhi 553d9b0f91 新增分成生效模板 5 years ago
chenzhi af1829c124 新增打款详情 5 years ago
yulingwei 99fcc4cbbb upt 5 years ago
zhengyongxing 2ce274486d 官方渠道修改江息网络 5 years ago
ELF 522f758bd5 修改 5 years ago
zhengyongxing 8dd071ecc7 市场结算定时器优化 5 years ago
chenzhi 3611e4855d 合并冲突 5 years ago
zhengyongxing edbd6f46a3 市场结算定时器找回 5 years ago
ELF e5a21b9224 修改 5 years ago
yulingwei 0472fe9cbc upt 5 years ago
chenzhi c7c67f279a 打款信息查看 5 years ago
chenzhi 3ef24c2c57 新增打款信息编辑 5 years ago
chenzhi 1f155020d4 新增是否允许打款 5 years ago
zhengyongxing 9aed64f46d 推广员充值汇总优化,补单功能添加 5 years ago
ELF 486b5e1f83 优化curl 5 years ago
ELF dc85bdb631 添加批量删除推广限制功能 5 years ago
ELF 69b09c582f 添加落地页限制规则 5 years ago
chenzhi 79a9a8c68c 新增重算 5 years ago
chenzhi d05d6e2159 新增导出 5 years ago
chenzhi 3b8d6eb128 新增导出 5 years ago
yulingwei 93601a3302 upt 5 years ago
chenzhi 88c70c29db 新增0不查看 5 years ago
yulingwei e6c8b51127 upt 5 years ago
chenzhi 547b512ead 暂存 5 years ago
yulingwei bbb7cb23f6 upt 5 years ago
yulingwei 3530456cfa upt 5 years ago
chenzhi 0f632f386b 下游个人聚合 5 years ago
yulingwei f969802c26 upt 5 years ago
廖金灵 a4d86b4fdd Merge branch 'feature/promote_statistics' of wmtx/platform into master
推广员充值统计添加默认时间
5 years ago
chenzhi 7d3e90514f 新增个人聚合 5 years ago
chenzhi f2ce52ada5 暂存 5 years ago
zhengyongxing 711f98ef86 推广员充值统计添加默认时间 5 years ago
廖金灵 22e5fe8d76 Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
5 years ago
ELF 1c3bb3604e 优化打包 5 years ago
廖金灵 6a8f1a517f Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
5 years ago
ELF 4f8f18a680 优化打包 5 years ago
廖金灵 154a0115dc Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
5 years ago
ELF 29595ff5d9 优化打包 5 years ago
zhengyongxing 4352b0c733 将官方渠道修改为江息网络 5 years ago
廖金灵 bd8842759e Merge branch 'hotfix/pack_package' of wmtx/platform into release
优化打包
5 years ago
ELF 02259ae330 修改bug 5 years ago
ELF 769193883d 修改bug 5 years ago
ELF d5d6c255b0 优化打包 5 years ago
yulingwei 6ada5711ab upt 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi dff3542fdd 新增个人信息获取 5 years ago
zhengyongxing 6da0ec1607 用户列表修改提交 5 years ago
chenzhi c6f4149d6a 修改下游个人聚合 5 years ago
chenzhi a3633ea52e 新增下游查看导出 5 years ago
廖金灵 b62eb3be7c Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release
隐藏市场总监电话
5 years ago
chenzhi 7ac118c024 下游公司查看 5 years ago
chenzhi 7a5c42eb5e 上游导出优化 5 years ago
chenzhi 427d6457fc 上游查看及导出 5 years ago
chenzhi eeec8b13f2 cp查看 5 years ago
chenzhi 4e4da92420 优化比例 5 years ago
chenzhi 2cf0fdf905 新增公会归属编辑规则修改 5 years ago
chenzhi 22aa5d3dd4 暂存 5 years ago
zhengyongxing f08c0cec9b 苹果beta包添加测试ip白名单 5 years ago
chenzhi 02e7d85e44 优化生成结算单 5 years ago
chenzhi bf24f9bc9d 开户网点该帐户名 5 years ago
chenzhi f7d67ff4c4 新增合作方阿里账号及用户 5 years ago
chenzhi cd0ff2ef8a 暂存 5 years ago
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单 5 years ago
chenzhi 466f1f4680 汇总提交ok 5 years ago
chenzhi c39da62037 新增是否打款 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi 903fc71255 新增补链账号错误 5 years ago
chenzhi 8bfe249251 新增备注 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago
chenzhi 1d92fdb1db 新增重算接口 5 years ago
chenzhi e80d4eb539 新增确认 5 years ago
chenzhi 93a8bb70e1 新增编辑 5 years ago
chenzhi 669bfa8f25 暂存 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
chenzhi 380243dbb8 优化结算的补点 5 years ago
chenzhi 4c0c51e0ae 上游结算ok 5 years ago
chenzhi fe7d21943b 暂存2 5 years ago
chenzhi c71c142227 暂存 5 years ago
chenzhi b4c93cc433 接口还原分离 5 years ago
chenzhi c59a314afe 优化聚合cp获取接口 5 years ago
sunke 51551e91df Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary 5 years ago
zhengyongxing 394ce7a544 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit 5 years ago
zhengyongxing 9aae41fd20 ip封禁隐藏区域 5 years ago
chenzhi 5c1a8d69a0 新增生效列表页面 5 years ago
chenzhi 8a508c050d 新增编辑 5 years ago
chenzhi 4b8538a3bb 新增审核操作 5 years ago
chenzhi f20cfde7c7 新增审核列表导出 5 years ago
chenzhi e684191b45 优化审核列表 5 years ago
chenzhi b5a604d385 优化添加 5 years ago
chenzhi e5dc86118e 新增优化 5 years ago
chenzhi 1139b37a50 新增公司关系绑定 5 years ago
chenzhi 3b8e7eb2b0 推广游戏分成管理ok 5 years ago
chenzhi a8fddb8f2f 优化游戏分成 5 years ago
chenzhi 0d8ec00225 优化排序 5 years ago
chenzhi 8a83e17485 新增导出 5 years ago