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

3235 Commits (f12dd32915a5ba4e4700e9a92418d2d01f15616c)

Author SHA1 Message Date
zhengyongxing c30e396b2c 未结算数据的补充
zhengyongxing 32abdbb390 汇总统计修改
chenzhi fc75b7d81d 优化统计
chenzhi 79588d52e8 优化财务汇总
chenzhi 8ef35174dc 优化个人补点
chenzhi 419793d91b 优化上游结算
tping 0aef9e3019 公会信息
chenzhi e6af0fbcd5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi b7cc3ccd77 优化权限
chenzhi 3fdc14120f 优化首页折线
郑永星 6699ce1045 Merge pull request '未结算数据的补充' () from feature/add_item into release 
未结算数据的补充
zhengyongxing f13ee0583c 未结算数据的补充
chenzhi d08691c13a 优化充值列表导出
chenzhi 29636f2922 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi fb798e82bf 优化下游推广公司搜索
chenzhi fe75b57618 合并master
chenzhi 0d533525fe 优化权限修改
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' () from feature/add_item into release 
12月功能提交,手机万能验证码屏蔽提交
zhengyongxing 309b195986 12月功能提交
陈志 79ad02ba2e Merge pull request '优化' () from feature/st_mange_20201202 into release 
优化
chenzhi 1945cae9a5 优化
张谷成 6e63a3857e Merge pull request 'feature/1211' () from feature/1211 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
tping cf88d4c1db Merge branch 'release' into feature/1211 
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
tping 6c266178df 数据互通
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' () from feature/st_mange_20201202 into release 
优化公式
chenzhi f4f430cf61 优化公式
zhengyongxing 23e5632eec 12月功能提交
chenzhi a3e0ecb949 优化结算公式
chenzhi 0f82acf447 优化权限修改
zhengyongxing f804b7af3f 12份功能提交
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item
zhengyongxing fb0acddb3f 12份功能提交
chenzhi f034698dbc 新增多库
tping 481646222f 后台 手机号规则 实名认证修改
zhengyongxing ec3491943b 12月功能提交
zhengyongxing 52ff4a2bc6 12月功能提交
zhengyongxing 9bec07c7d4 不结算bug修改
zhengyongxing 747224dae9 12月功能提交
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 
# Conflicts:
#	Data/update.sql
zhengyongxing 8bb8e4379f 12月功能提交
zhengyongxing b8af3ea384 12月功能提交
zhengyongxing 7e41ad1e18 12月功能提交
zyx 6b0de87280 未结算接口修改
chenzhi a741e8d37d 订单新增设备类型
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
chenzhi 24f3489e65 优化导出新增公式
chenzhi 8d156ffb64 新增结算公式
zhengyongxing 166c1d63d6 12月功能提交
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master 
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
chenzhi 3053461ee5 优化奖罚排序
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
zhengyongxing 923851fea7 11月bug修复
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
chenzhi 943d63faac 优化财务汇总
zhengyongxing 564a2ec91d 11月bug修复
郑永星 3f7c20c3ab Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0e67e37436 11月bug修复
郑永星 e179d507e8 Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0572fde5ad 11bug修复
廖金灵 3e27f09e7d Merge branch 'feature/add_item' of wmtx/platform into master 
特殊补点用户名修正
chenzhi a20285a42e 优化是否参与结算导出
zhengyongxing 08dd238ca4 特殊补点用户名修正
chenzhi e7cd32b2a2 优化是否结算参数
廖金灵 bfbac3b30a Merge branch 'feature/add_item' of wmtx/platform into master 
汇总刷新接口提交
zhengyongxing ef13761820 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
zhengyongxing d6b8fa208c 汇总刷新接口提交
chenzhi 9ddfb6f794 现在参与结算筛选
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
chenzhi 2d0bba8de5 优化修改推广游戏操作日志
chenzhi 5644570c1e 新增日志
陈志 4da7fa623f Merge branch 'feature/add_item' of wmtx/platform into release 
优化新增仅单参与结算是结算
chenzhi 5e9723b040 优化新增仅单参与结算是结算
chenzhi 74d9d6ed18 优化充值操作
郑永星 9a008d2bfc Merge branch 'feature/add_item' of wmtx/platform into release 
换行字数修正
zhengyongxing b54b37e99c 换行字数修正
郑永星 4262b55a66 Merge branch 'feature/add_item' of wmtx/platform into release 
市场业绩bug修正
zhengyongxing 59ec6c28ca 市场业绩bug修正
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release
chenzhi 73f8c16379 游戏统计修改bug
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留
zhengyongxing ed8d1fee0a 小数点保留
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留两位添加
zhengyongxing b54b2660d4 小数点保留两位添加
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数判断
zhengyongxing 711992a287 保留两位小数判断
chenzhi eeb1821859 暂存
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数
zhengyongxing c829c56956 保留两位小数
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release 
内团去除比例结束时间减1
zhengyongxing 1717c2958b 最大值判断添加
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
修改游戏统计bug
ELF e46cc5b52e 修改bug
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126 
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
万盟天下 41ab9703a9 Merge branch 'feature/add_item' of wmtx/platform into release 
11月功能提交
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
游戏统计/后台登录时间修改
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others 
 Conflicts:
	Data/update.sql
chenzhi 9da9941c9f 优化支付数据查看
zhengyongxing 3d1ab70123 11月功能提交
zhengyongxing 5c27c63835 11月功能提交
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master 
根据推广公司配置推广后台
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 710439d8df 11月功能提交
tping dd786dc27f 1126 批量上下架
chenzhi 986065ab4b 优化名词
zhengyongxing c749df4936 11月功能提交
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
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 支付通知 补单
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
ELF 773068b57c 优化代码
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
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 ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
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修改
zhengyongxing 48f4fef494 外团特殊比例自动审核通过
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过
zhengyongxing 324deba9c2 外团特殊比例功能提交
zhengyongxing 24f3cbc99e 外团特殊比例功能提交
zhengyongxing cf21a4f324 外团特殊比例自动审核通过
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过
chenzhi 3db0914108 优化导出公司
chenzhi 833619518b 优化测试
chenzhi 9002ae24be 优化重算
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游
chenzhi d029e4562d 优化上游
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游pool
chenzhi 6f90b18be9 优化上游pool
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release 
内团推广游戏提示语修改
zhengyongxing 178f89f43b 内团推广游戏提示语修改
郑永星 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 外团推广功能提交
chenzhi 6ce7377dc1 优化补点
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 233fa89251 外团推广功能提交
zhengyongxing 38fb5398d1 外团推广功能提交
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据
zhengyongxing 8340ddc115 外团推广功能提交
zhengyongxing a5c7c224aa 比例功能提交
zhengyongxing 34b12ad382 定时器功能提交
zhengyongxing 5c497b94dc 分成比例导出修正
zhengyongxing c1b556b0b1 市场业绩排序修改
chenzhi 10d13472ec 紧急修复外团选择游戏
zhengyongxing 6ac5c1d524 比例逻辑修改
zhengyongxing 40664b5f8d 市场业绩功能修改，将不结算毛利以日来统计
zhengyongxing ba6323203a 模板比例bug修改提交
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
zhengyongxing aa852a9a7f 外团推广功能金额修改
zhengyongxing f0cbe3cafb 周结算金额bug修改
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
zhengyongxing 3855d8d3a9 市场业绩的功能提交
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
ELF 3a4fb51222 修改支付商户规则bug
ELF e25f30d13c 修改
ELF dc5e032817 修改
ELF fe55de4aaf 修改
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 4f35cacbab 汇总模板修改提交
ELF 36c4c666ec 修改bug
ELF c5fe80639f 修改
ELF 06bd640c79 修改