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

6212 Commits (be8a30a2e84e8970067344bd657a6b7ce833f060)

Author SHA1 Message Date
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
ELF a0f57749c4 优化当前域名获取
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
tping 3471639489 支付通知 补单
tping 103acdd15d 支付通知 小数点后面.00
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
ELF 773068b57c 优化代码
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
ELF dd7068e3ae 改用redis存储session
tping 025d90f5fa 1126
chenzhi ad1d4e65a5 优化游戏汇总
chenzhi bea27fd5de 优化游戏汇总
tping c75d73c9f7 1126
ELF 6a50654045 游戏统计/后台登录时间修改
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master 
汇总bug修改
zhengyongxing e098384635 汇总bug修改
zhengyongxing 3656c555d1 11月功能提交
chenzhi ffd8c92940 优化奖罚
ELF 89332c0d54 解决冲突
ELF eef296ea08 发放资源自动审核/发放优化
ELF b92f564a49 发放资源自动审核/发放优化
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF 977cfcba3c 修改
ELF c20d071817 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF 3a6b912399 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF d0b2e5f459 优化
ELF 1f3eaa06da 修改
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
chenzhi cdd1cd7d7f 优化页面页数
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
推广员信息显示通过权限控制
ELF 53f3ad6864 优化
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
市场专员信息显示通过权限控制
ELF dfdc31f4dc 市场专员信息显示通过权限控制
zhengyongxing 6021f91604 公会订单添加所属商户
zhengyongxing 3f04fa1507 公会统计商户名称修改
zhengyongxing deee3228dd 公会统计商户导出
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
zhengyongxing 767ce5734d 市场业绩重算只重算上个月提交
zhengyongxing a3b86e9339 市场业绩提成修正
zhengyongxing d85ac9066d 市场业绩bug修改
zhengyongxing 6c005f01f6 市场业绩比例永久判断bug修改
廖金灵 f7eb64f6ba Merge branch 'feature/add_item_other' of wmtx/platform into master 
外团特殊比例自动审核通过
zhengyongxing 48f4fef494 外团特殊比例自动审核通过
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过
zhengyongxing 324deba9c2 外团特殊比例功能提交
zhengyongxing 24f3cbc99e 外团特殊比例功能提交
郑永星 e28e7c347e Merge branch 'feature/add_item_other' of wmtx/platform into release 
内团特殊比例自动审核通过
zhengyongxing cf21a4f324 外团特殊比例自动审核通过
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过
廖金灵 3099b175c8 Merge branch 'hotfix/orderquery' of wmtx/platform into master 
增加清除时间
郑永星 bf4e31d73d Merge branch 'feature/add_item_other' of wmtx/platform into release 
特殊比例申请比例限制提交
zhengyongxing d73602d30b Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other
zhengyongxing 0155111706 特殊比例申请比例限制提交
chenzhi 3db0914108 优化导出公司
zhengyongxing b3658dfaa9 比例方法提交
张谷诚 f23f456ddc Merge branch 'hotfix/orderquery' of wmtx/platform into release 
增加清除时间
tping 5a57d87ff7 增加清空时间
chenzhi 833619518b 优化测试
chenzhi 9002ae24be 优化重算
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游
chenzhi d029e4562d 优化上游
廖金灵 a3ce776d16 Merge branch 'feature/version_1028' of wmtx/platform into release 
优化代码
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游pool
chenzhi 6f90b18be9 优化上游pool
ELF 2dc69ac892 修改
廖金灵 710573f511 Merge branch 'feature/version_1028' of wmtx/platform into release 
修改数据汇总bug
ELF 75754a8957 修改
张谷诚 fc666fa7b1 Merge branch 'hotfix/orderquery' of wmtx/platform into release 
导出支付显示问题
tping 1c6a17d50f 支付方式显示
张谷诚 f25bc96071 Merge branch 'hotfix/orderquery' of wmtx/platform into release 
到账时间导出
tping adb011ca5a 到账时间
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release 
内团推广游戏提示语修改
zhengyongxing 178f89f43b 内团推广游戏提示语修改
张谷诚 0c9033e700 Merge branch 'hotfix/orderquery' of wmtx/platform into release 
到账时间导出
tping e86f4c4762 到账时间
郑永星 a9f96722b1 Merge branch 'feature/add_item_other' of wmtx/platform into release 
外团推广功能提交
zhengyongxing 25e710c27e 外团推广功能提交
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release
tping e6ae117fd7 1,隐藏删除按钮（后台->推广->游戏分包） 
2,推广后台增加下单时间查询
zhengyongxing 0f44573fe2 市场业绩提交
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other 
 Conflicts:
	Data/update.sql
zhengyongxing ce3aa147e5 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing ccf27d77a1 市场业绩删除修正
chenzhi 9083471980 优化补点
zhengyongxing 295f86e588 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 7463222308 外团推广功能提交
chenzhi 3f6472e64c 优化下游个人补点
zhengyongxing e33b19d4b0 外团推广功能提交
zhengyongxing 4e8cb8dfe1 外团推广功能提交
zhengyongxing f569747948 外团推广功能提交
zhengyongxing f38b9026b5 外团推广功能提交
zhengyongxing f6f9437ed0 外团推广功能提交
zhengyongxing b0b893e51d Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 80b148d6c5 外团推广功能提交
廖金灵 9c6f1b6789 Merge branch 'feature/version_1028' of wmtx/platform into release 
修改bug
ELF be9075fc63 修改bug
chenzhi 6ce7377dc1 优化补点
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 233fa89251 外团推广功能提交
zhengyongxing 38fb5398d1 外团推广功能提交
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据
zhengyongxing befa97e04d Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 96b296a4b6 优化比例为空
zhengyongxing 8340ddc115 外团推广功能提交
zhengyongxing c27315d3c0 外团推广功能提交
chenzhi ded1da96f9 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 7ade60fb02 优化比例获取
zhengyongxing a5c7c224aa 比例功能提交
zhengyongxing 823e241f2e 外团推广功能bug修正
廖金灵 001b390afc Merge branch 'feature/version_1028' of wmtx/platform into release 
修改评级等功能
ELF 34586b228e 修改
ELF 8c8d01a446 修改评级
zhengyongxing 97c33c8e1b 游戏比例公用方法修正
zhengyongxing 34b12ad382 定时器功能提交
zhengyongxing 5c497b94dc 分成比例导出修正
ELF 092683425d 修改
zhengyongxing 2dbb4a7940 市场部提示语修改
zhengyongxing c1b556b0b1 市场业绩排序修改
chenzhi 10d13472ec 紧急修复外团选择游戏
zhengyongxing 6ac5c1d524 比例逻辑修改
zhengyongxing 0c69c8f662 汇总结算结算时间位置修改
zhengyongxing 40664b5f8d 市场业绩功能修改，将不结算毛利以日来统计
zhengyongxing ba6323203a 模板比例bug修改提交
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
ELF 3c11826a1c 修改
zhengyongxing aa852a9a7f 外团推广功能金额修改
zhengyongxing f0cbe3cafb 周结算金额bug修改
elf@home f13f3f7744 修改
ELF 3f92608468 推广后台功能开发
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing e30cd2fea7 外团推广功能提交
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing f8a7d53ac8 外团推广功能提交
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
zhengyongxing 3855d8d3a9 市场业绩的功能提交
ELF 47ff398bf4 修改
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
ELF 3a4fb51222 修改支付商户规则bug
ELF e25f30d13c 修改
ELF dc5e032817 修改
ELF fe55de4aaf 修改
ELF 65c5a221fc 修改
zhengyongxing 32b139a976 比例时间排序
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
ELF b44a5118cf 修改
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master 
测试资源功能提交
ELF 36c240c608 修改
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing d9b37792fd 特殊补点bug修正
zhengyongxing 6b47baf59a 汇总编辑前端修改
ELF ae3e49b95f 修改
ELF f77505925f 修改
ELF f3771dfd2d 修改
ELF a10bb888da 修改bug
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 36c4c666ec 修改bug
ELF 18c3e95f30 修改
ELF 8e4ba0e20e 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF 36c5b542ee Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge
ELF b7104222a5 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge
ELF f0d79c83a2 修改
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出bug修正
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正
zhengyongxing 723b3c9fa2 汇总重算提示语修正
zhengyongxing e7b64f27f2 汇总重算提示语修正
郑永星 8d37653db4 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出公式添加
zhengyongxing ff46e189cc 聚合结算单导出公式添加
郑永星 a8c008923e Merge branch 'feature/add_item' of wmtx/platform into release 
汇总导出bug修正
zhengyongxing 053e8acb8f 汇总导出bug修正
郑永星 6cbc8e0102 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合汇总导出bug修改
zhengyongxing 1f31244d10 聚合汇总导出bug修改
郑永星 37dd11369e Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出bug修正
zhengyongxing ac5c1a199c 聚合结算单导出bug修正
廖金灵 e916641647 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出个人与公司导出不相同
郑永星 ac14a6be90 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出个人与公司导出不相同
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同
zyx b92ce713b3 聚合结算单上线
廖金灵 ef9a6d446b Merge branch 'feature/promote_level_sys' of wmtx/platform into master 
游戏统计bug
ELF 2b1980bfbd 修改
廖金灵 51e3863b82 Merge branch 'feature/add_item' of wmtx/platform into master 
导出公式添加
zhengyongxing f72bb66356 导出公式添加
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司汇总公司添加，公司绑定编辑开放
郑永星 cdcfc02614 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定参数错误修正
zhengyongxing 0d13b05dc0 公司绑定参数错误修正
郑永星 38eb0f4957 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 71826be2cc 汇总bug修正
郑永星 0fd8c71af0 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing ba74305974 汇总bug修正
郑永星 ed4297cb71 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing c711ef4b92 汇总bug修正
郑永星 d7edb41f44 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 01df95637a 汇总bug修正
郑永星 61d69eab60 Merge branch 'feature/add_item' of wmtx/platform into release
zhengyongxing f1308fce73 汇总bug修正
郑永星 b69bc8ef6a Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 3f78880f7d 汇总bug修正
ELF 2ff1fc0041 修改
ELF 55466e44ee 修改
ELF dec6c4b222 修改权限
chenzhi f311da5208 优化银行卡号不限制
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zyx a2d68a2752 汇总状态的操作修改
zyx 5bec0ba91c 汇总状态的操作修改
zyx c99cad808c 汇总状态的操作修改
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
zhengyongxing dc5a65903b 汇总bug修正
ELF e493eedc3f Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_level_sys
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing 4210bb7bf0 汇总bug修正
ELF 8d1a58d583 修改
ELF d33bb3f3f8 修改
zhengyongxing b4bdcd24fc 汇总bug流程修正
ELF 2ae89b9edb 解决冲突
ELF 95248d3582 修改
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
ELF 0169d8a2db 修改
郑永星 1eef1ea4c3 Merge branch 'feature/add_item' of wmtx/platform into release 
审核拒绝bug修正
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master 
审核拒绝bug修正
zhengyongxing 7d3c8ebd61 审核拒绝bug修正
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master 
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
ELF c42a123ad7 修改
ELF 9b11202deb 修改
ELF 28fbbff699 修改
ELF 8d2e61153b 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF fbbc30c874 Merge branch 'master' of 47.111.118.107:wmtx/platform into release
万盟天下 bf1c302803 Merge branch 'hotfix/reset_data_session' of wmtx/platform into release 
修改
ELF ca99068a0e 修改
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合公司绑定修正
zhengyongxing a977cf5f31 聚合公司绑定修正
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release 
特殊比例bug修正
zhengyongxing 0dd7bceb3f 特殊比例bug修正
ELF 19c782b053 解决冲突
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总权限测试
zhengyongxing 6b486331b5 汇总权限测试
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定修正
zhengyongxing f4f822d31a 公司绑定修正
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release 
绑定公司修正
zhengyongxing f757c10c61 绑定公司修正
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release 
小bug修改
zhengyongxing 0ebaf6ed64 小bug修改
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing c06e53ab31 汇总bug修正
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
ELF 2f4868553a 修改
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925