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

2901 Commits (2d0bba8de50c017696863160305ae92c83ac7054)

Author SHA1 Message Date
zyx a2d68a2752 汇总状态的操作修改
zyx 5bec0ba91c 汇总状态的操作修改
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
zhengyongxing dc5a65903b 汇总bug修正
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修正
zhengyongxing b4bdcd24fc 汇总bug流程修正
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
郑永星 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修正
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合公司绑定修正
zhengyongxing a977cf5f31 聚合公司绑定修正
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修改
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
ELF 268ea4e34d 修改
zhengyongxing 465f095dc4 市场业绩bug修正
chenzhi 7a8b91c8f0 优化下游同游戏判断
zhengyongxing 7a021dced5 市场业绩提示语修正
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change 
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release 
优化删除游戏报错bug
ELF 24fe97186e 修改
chenzhi c40e366a03 优化删除游戏报错bug
chenzhi 02aa1bd088 优化1
zhengyongxing c9516b8751 未汇总汇总功能提交
zhengyongxing 4b44356a6d Revert "优化下游个人同游戏判断" 
This reverts commit f22dc90e
chenzhi f22dc90e96 优化下游个人同游戏判断
zhengyongxing 2cdc4e815b 下游公司cp比例修改
zhengyongxing 28f73f3140 公司比例格式修改
chenzhi 3ef485516f 优化工会游戏修改
zhengyongxing c366fcfe4e 汇总编辑功能提交
zhengyongxing 825d4e51c9 聚合公司绑定功能修改
zhengyongxing 4e9bde9c10 汇总编辑提交
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改
zhengyongxing d937dbad55 聚合公司绑定功能修改
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加
zhengyongxing 14ad9ce93d 聚合公司绑定功能及汇总提示语添加
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加
zhengyongxing 868889fe54 汇总编辑功能提交
zhengyongxing bc627cf224 汇总导出bug修改
ELF ad34536256 修改
zhengyongxing 895b32cee8 汇总bug修改
zhengyongxing 60210fedef 撤销汇总名词修改
zhengyongxing fedcbd605b bug修改
ELF 6fcaa1362c 重置权限缓存
zhengyongxing 518c902b2a 发起汇总修正
zhengyongxing ceef36a7d1 内部公司功能完善
zhengyongxing ab9be65422 内部公司功能提交
zhengyongxing 0631c22c93 上游导出修正
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change 
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 400a9b3ded 上游导出修正
zhengyongxing 3c698adba9 上游导出修正
chenzhi 97af14147e 优化下游个人结算
万盟天下 f52cf8947a Merge branch 'hotfix/bug_change_now' of wmtx/platform into master 
补点游戏生成多条及内充也计入
zhengyongxing cdb02aa821 补点游戏生成多条及内充也计入
郑永星 77e8161159 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
汇总删除修正
zhengyongxing c5e272fb36 删除功能修正
chenzhi f169d65c1c 优化推广公司添加排序
chenzhi 4a3cb6f6bb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing a5090c3793 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
zhengyongxing 7ef0f125c1 特殊补点删除功能提交
zhengyongxing 47e373639d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
郑永星 c7ba3e3ba3 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点bug修正
zhengyongxing ab7ae80634 补点bug修正
郑永星 2e4904861b Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
特殊补点功能bug修正
zhengyongxing 65dc1dec9e 特殊补点功能bug修正
chenzhi 7a135f1019 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
廖金灵 5e2c093ea4 Merge branch 'hotfix/payStatistic' of wmtx/platform into master 
判定是否录入过修正
郑永星 b65b8c6b2f Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
判定是否录入过修正
zhengyongxing 229d8d2a50 判定是否录入过修正
郑永星 a80f68ef5e Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点比例非负数修正
zhengyongxing df3b058b91 补点比例非负数修正
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master 
补点功能修正
郑永星 98563b686d Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点功能修正
zhengyongxing c7af3bdb1d 补点功能修正
chenzhi bcdbb3d0a0 优化导出保留两位小数
zhengyongxing c0406a6f52 上游导出修正
chenzhi e085b6cc78 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi f73a9033b3 新增下游个人比例
廖金灵 1b9aa5c87e Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点游戏有流水的就给予展示
zhengyongxing af5878a98f 补点游戏有流水的就给予展示
廖金灵 de3477dd27 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点功能修正
zhengyongxing b39629fe08 补点功能修正
郑永星 223c3a63f2 Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
支付渠道优化
zhengyongxing 64e2517b93 支付渠道优化
chenzhi 329c5696d6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总
郑永星 c9497ee3f3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 3adf8a93f8 比例格式修正
chenzhi e10b27a067 优化下游内团江息网络归属
万盟天下 956d6c35a7 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
优化
万盟天下 9d6b18009a Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
ELF 4bb7015e1b 测试
万盟天下 25c06c4b2d Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改功能
万盟天下 eb7346c4a9 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
权限优化
ELF f37f6c51dd 修改功能
chenzhi 2ff538886c 优化上游结算
郑永星 700841fe7f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点与其他汇总重算功能区分添加限制
chenzhi 75c7b635b6 优化上游结算检索
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
特殊补点与其他汇总重算功能区分添加限制
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
郑永星 7a9a12f99c Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点无法重算限制
zhengyongxing e94994993a 特殊补点无法重算限制
郑永星 c4ea44c3f8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点权限
廖金灵 ef5c95f49a Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
优化
ELF 1b949af7f5 优化
廖金灵 cf821ae447 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
特殊补点权限
zhengyongxing ba80668560 特殊补点权限
chenzhi 9c11344906 优化下游推广公司导出
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 1c08d1a221 比例格式修正
郑永星 10e50b4bec Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例与日期格式修正
zhengyongxing f18f3ce7e2 比例与日期格式修正
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
陈志 4813e28fec Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化汇总说明
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
小bug修改
zhengyongxing 5acd5197ae 小bug修改
chenzhi b899ff7af7 优化汇总说明
ELF bdc23b7d90 修改
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
优化
ELF 1fb2fa7e81 解决冲突
ELF 8d98bd5a36 优化
ELF d123f7b779 优化
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
郑永星 e554d9c288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点加入下游结算中
zhengyongxing 19c7f7db0d 特殊补点加入下游结算中
郑永星 1aebf2b939 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点分成金额功能修正
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正
ELF 268e084241 修改
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化重算按钮的出现
chenzhi ae9d7f7574 优化重算按钮的出现
郑永星 7c5ec40288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点bug修正
zhengyongxing a29a8e43ff 特殊补点bug修正
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
ELF 9d67a4c842 优化
郑永星 e3850d18f5 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
平台结算导出与列表选项修改
zhengyongxing a146dd820a 平台结算导出与列表选项修改
chenzhi 8baab09004 优化备注
陈志 aa2feb7e1e Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化海南结算
chenzhi 927c5b8595 优化海南结算
chenzhi a3a3505894 新增官方渠道结算
郑永星 9f0f9b7951 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
市场专员业绩下游流水及特殊补点功能提交
zhengyongxing b14d2d197c 市场专员业绩下游流水及特殊补点功能提交
廖金灵 d29ec01ab6 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF b9779df6b1 修改
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF 0ff1089682 修改
廖金灵 c633109176 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
留存率不区分设备
ELF 619e1de3f3 留存率不区分设备
陈志 c1fbda369b Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化财务汇总测试收入
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
测试订单优化
ELF 3c3222ad26 测试订单优化
chenzhi eb2cd7d50f 优化财务汇总测试收入
陈志 d130e6cf6d Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人汇总导出异常
chenzhi f405faa924 优化个人汇总导出异常
陈志 053d1de648 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人结算
chenzhi 1a55fbce69 优化个人结算
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
聚合订单查询
ELF a18e4188bd 修改bug
chenzhi 05f11648a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
郑永星 f0153776c3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例功能修正
zhengyongxing 3b2ddded90 特殊比例功能修正
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
ELF 6596e01a29 修改
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other 
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
chenzhi 31af865a9f 优化线下打款确认
郑永星 3bc318daf3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例申请功能提交
zhengyongxing 418d5a6bda 特殊比例申请功能提交
ELF 6e2fda1e26 解决冲突
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release 
新增游戏自动授权
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
游戏统计/聚合订单数据相同
zhengyongxing 23555f8d4d 特殊补点功能修改
zhengyongxing 0215082018 特殊补点bug修正
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing cd331f2c64 上下游聚合打款信息修改
chenzhi 9234919180 优化导出
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 2c005d1996 特殊补点汇总功能修改