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

3262 Commits (180332ab87d7c88be1aea7d7b144777bd91df364)

Author SHA1 Message Date
廖金灵 9e3de695ca Merge branch 'feature/plateform_statistics' of wmtx/platform into release 
市场部统计修改
廖金灵 e4ab39bf64 Merge branch 'feature/ip_search' of wmtx/platform into release 
IP查询
zhengyongxing ea2683716f 下游公司字段与上游公司字段一致
廖金灵 54ad7191b1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
聚合公司及增加手机登录功能
廖金灵 2ea819c585 Merge branch 'feature/finance_statement723' of wmtx/platform into release 
新增防止并发请求数据
廖金灵 949570abf4 Merge branch 'feature/game_agg' of wmtx/platform into release 
游戏统计显示聚合数据
ELF ff47282287 修改
chenzhi 5ef1aa6e22 新增防止并发请求数据
ELF e0f71b67c5 处理
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
zhengyongxing 09629a12a8 下游公司字段与上游公司字段一致
陈志 d5c54234b3 Merge branch 'feature/finance_statement723' of wmtx/platform into release
chenzhi e3022cb6c2 关闭测试验证码
ELF 6f8b93a26b 修改
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致
陈志 e01c7e4e01 Merge branch 'feature/finance_statement723' of wmtx/platform into release
chenzhi 69615c1459 优化脚本执行
chenzhi 0e8730b810 优化重算需重新确认
ELF 56282658fc 解决冲突
ELF 0206a422f9 解决冲突
chenzhi fb9deff8b7 优化新增生效的默认时间
chenzhi 0f023bed36 优化结算提示
ELF fbe8d7a351 修改bug
chenzhi e2bd47ac2d 优化按钮太挤
chenzhi fe1853065a 优化结算原包名显示
chenzhi b9604c162a 优化操作时间判断
chenzhi 8de452c8f7 优化名称显示
chenzhi f4be3972b2 优化结算单确认
chenzhi b7409ab069 优化导出
chenzhi eb311348a8 优化检索
chenzhi 47b54d336c 优化汇总撤回
chenzhi 4d65542338 优化结算包名文字
chenzhi 2a303cf0f5 优化审核流程
chenzhi 0aac0cfad7 新增结算类型
chenzhi 31b1c771a1 新增全量查看
chenzhi a69b21dd14 汇总单新增周月结审核
chenzhi 3ef8061e3e 优化个人0值重算
chenzhi 6b9358c651 优化结算
chenzhi 3cbc769bce 优化个人结算
chenzhi f70d8cb8a7 优化个人结算
chenzhi 7f01c3ff39 优化上游结算方式
chenzhi f91b2a5dce 优化下游结算
chenzhi d946a4c91c 优化下游公司结算
chenzhi 8e77f3ed4d 优化上游结算
chenzhi 16a3bea172 优化上游新增服务器费用结算包名
chenzhi 51c4b07eea 优化上游结算包名
chenzhi 2de8e4a313 开启测试验证码
chenzhi b0034d5f19 优化推广公司游戏申请不审核
chenzhi a948986b41 优化上游导出
chenzhi 62f2bc350d 优化时间控件
chenzhi 5c857840a2 分成比例新增生效检索
chenzhi 94a3057013 新增游戏分成比例导出
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
廖金灵 5f0917220c Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release 
推广分成特殊申请
chenzhi 8e4541cb01 推广分成特殊申请
廖金灵 762c93d89e Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release 
优化电话不限制
chenzhi b1790a8897 优化手机不限制
廖金灵 c67cbc61c2 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release 
优化电话不限制
chenzhi 0430293bb7 优化电话不限制
chenzhi 1e3b1dad66 优化排序
廖金灵 4869d650d9 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release 
时间格式修正，导出格式修改
zhengyongxing 815e2e3b88 时间格式修正，导出格式修改
chenzhi 6024ae342c 优化顺序及导出
zhengyongxing 08e221a53c 商户专员隐藏
chenzhi 8ded1f3169 优化游戏模板显示
chenzhi 4460f8e7cf 新增结算包名
廖金灵 a958f8c043 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release 
聚合公司详情详细网址条件修改
zhengyongxing 52fe6d04f8 聚合公司详情详细网址修改
廖金灵 a70a494102 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release 
聚合公司详情详细网址修改
zhengyongxing 4325ed23ee 聚合公司详情详细网址修改
chenzhi 3ff79ce6c1 优化公会检索
chenzhi 832f531d20 优化审核通过
廖金灵 b8532da607 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release 
聚合公司详情详细地址格式修改
zhengyongxing 5bbdfe7e74 聚合公司详情详细地址修改
ELF 557f0203ac 解决冲突
廖金灵 5d809ae9b8 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release 
优化合同期限查询
chenzhi eaa6762935 优化模板错误
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
chenzhi 0197743266 优化合同期限查询
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改
chenzhi 4dd8526e2b 优化日志
chenzhi 3ad0d447d4 优化显示
chenzhi 4501036ba8 优化导出错误
chenzhi 069cc1599a 优化上游检索
chenzhi 5a962e1b73 新增分成优化
zhengyongxing 26f13922a1 聚合公司时间修正
chenzhi 0237e0ff63 优化导出
chenzhi 6181059faf 优化搜索
chenzhi 945f033df5 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance
chenzhi 10e56211ce 优化导出提示
chenzhi 1ec951d344 优化空值显示
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证
chenzhi f66bce14b2 优化下游列表显示及导出
chenzhi 5894324ca8 旧数据脚本
chenzhi 94cbae1924 优化打款提醒
chenzhi c733fc2e15 优化游戏删除
chenzhi d015bce440 优化推广下游查看
chenzhi 80e8477b51 新增检索
ELF c127ea6139 修改bug
ELF 546d83f4a3 修改bug
ELF bb8052614b 修改推广游戏分成市场专员权限控制
chenzhi a3f28b67a5 新增游戏搜索
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上
zhengyongxing 341fa19b6f 聚合公司功能提交
zhengyongxing 2fe7c864df 聚合公司功能提交
zhengyongxing 420723f593 商户充值汇总更改名称
zhengyongxing 4c3112b70e 充值信息查看权限添加
zhengyongxing 837358f86b 支付商户统计字段展示修改
chenzhi d91d8346b9 优化下游导出
yulingwei 1c633e60cb upt
ELF 27ccee9b20 修改
ELF 46fc13a91e 修改
yulingwei 6c23a3ee52 upt
yulingwei 9a380d7756 upt
ELF 1bec15c186 修改迁移bug
chenzhi 8ac604be33 优化导出
chenzhi 6bb398bcc3 优化下游显示
yulingwei 7b9bb91e16 upt
ELF cefed5c559 修改
zhengyongxing a09da4a184 聚合下游公司列表导出修正
zhengyongxing 1ff82cce20 聚合下游公司列表添加
chenzhi 8c191c2f05 优化推广员公司列表
chenzhi 5367ea4aae 优化前端
ELF f3b323bda8 修改
yulingwei e5996b47cc upt
yulingwei 0a9e7ed3ef upt
yulingwei e789c941ed upt
yulingwei 7830cef93d upt
chenzhi bffbd6a2b1 优化ok
chenzhi 2619e598e8 合并marster
chenzhi 22a65f8404 优化下游支付宝导出
yulingwei e0d74cbffd upt
chenzhi 1bc3dab93c 新增下游渠道比例
yulingwei 066610f236 upt
yulingwei 877a53e892 upt
yulingwei f373bd2025 upt
yulingwei deac7da5ff upt
yulingwei 25dec010be upt
yulingwei 28a44019e4 upt
yulingwei eaa25ebcda feature/desposit
zhengyongxing cacb1e4cf4 商户统计结算功能添加
ELF 096e32d581 商户配置
yulingwei 2fbea72d26 up
chenzhi b4c6f4316a 优化显示
chenzhi afac0376be 新增下游审批
chenzhi 7d404c6904 优化查看
chenzhi cafdc39f2a 优化添加
zhengyongxing cb0ceda1cb 聚合财务导出模板修正
zhengyongxing ee6be3b45b 市场业绩提成当流水不足起提流水时，税后毛利不予展示
chenzhi d662c89b7e zancun
zhengyongxing 960903a31c 新功能添加
chenzhi f731a417bd 优化工会关系
chenzhi d9d55a3bcb 优化新增下游公司
zhengyongxing 1abaa7c646 支付渠道名称修改
zhengyongxing 729136a95c 聚合订单代码导出，及重算功能修改
ELF e8a925b64c 游戏统计添加聚合充值数据
chenzhi 69adcbabf8 优化推广公司
chenzhi 5aa7427504 新增公司信息编辑
chenzhi c708fb6d11 优化CP搜索
yulingwei 20ac65f12a upt
yulingwei dda43c7289 Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
yulingwei 555fd052fe upt
chenzhi 35f2fe3f05 优化公司显示
yulingwei e337ecac5e upt
yulingwei c8bd476a60 upt
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正
chenzhi f7d90780aa 新增CP公司审核
zhengyongxing cd8f64c7e6 游戏详情订单修改
chenzhi 33cf2cf8a6 新增审核列表
yulingwei adc3acd992 upt
yulingwei 33049f5a9f upt
ELF 05fac79ed3 修改
chenzhi 0c2e2db65d 新增税费费率
zhengyongxing 288f121955 添加手机登录的功能
yulingwei e155c92ed6 1
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
chenzhi 58c8508ce4 新增cp导出
chenzhi bd3510581f 新增CP导出生效时间
chenzhi f66ec6d1ff 优化函数
chenzhi 296b5a0d8f 优化关系函数
chenzhi 3349304e10 新增上游预警金额读取
ELF c87b61d94b 修改发票类型
ELF 0f0d52c78f 修改
ELF b448f0829e 修改公司绑定默认值
yulingwei 98413791aa repair
万盟天下 32d4450e4a Merge branch 'featurn/markets' of wmtx/platform into master 
名字增加修改
zhengyongxing 53f490ea20 名字增加修改
万盟天下 00d99897b0 Merge branch 'hotfix/gitbag_op' of wmtx/platform into master 
优化后台礼包
ELF 007b7b5c1f 优化后台
ELF 15d0b454a4 修改
万盟天下 72115a9ede Merge branch 'feature/promote_statistics' of wmtx/platform into release 
推广员统计修改
yulingwei 64bb801be2 1
yulingwei 6390d680ec upt
yulingwei 96327507f4 upt
yulingwei 52b478f570 upt
yulingwei 7fc6609d78 upt
yulingwei aa77fb7821 upt
zhengyongxing 2220a6cfec 财务支付时间修改，增加手机登录验证，及开发推广员列表名称
yulingwei 51a1c9c707 upt
yulingwei b9dfe08177 upt
yulingwei 1119e8faf9 upt
chenzhi 2f9269f29f 取消默认选择时间
chenzhi 6c1f898fb9 优化换绑时间
yulingwei 80597c4894 upt
chenzhi db64bea72f 优化提醒
chenzhi 617cfbd4bf 优化换绑
yulingwei 5e5aa8ca3f upt
yulingwei 0b54c71cb0 upt
chenzhi d6ec8e0248 新增导出
廖金灵 831c87c9ee Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
优化公会统计
廖金灵 420c3454fc Merge branch 'hotfix/fan_promote' of wmtx/platform into master 
优化公会统计
廖金灵 3065ba060f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
条数修改
zhengyongxing fd926a0795 条数修改
郑永星 b77a3a1136 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
groupby市场专员id添加
zhengyongxing 5ea0f21574 groupby市场专员id添加
廖金灵 3095270a84 Merge branch 'hotfix/fan_promote' of wmtx/platform into release 
修改工会统计
ELF f167d63c4a 修改
郑永星 8076e22b2f Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing ce2540919c 市场专员筛选
郑永星 c036175a14 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
市场专员筛选，月份跳转，及时间筛选修正
zhengyongxing 039b496b28 市场专员筛选，月份跳转，及时间筛选修正
zhengyongxing 96f68c4f50 市场专员筛选，月份跳转，及时间筛选修正
elf@home fb87be0b43 修改
廖金灵 83a1f15de5 Merge branch 'feature/market_percentage' of wmtx/platform into release 
跳转汇总结算单默认事件添加
zhengyongxing cd208fbfd7 跳转汇总结算单默认事件添加
廖金灵 6f3a94a31b Merge branch 'feature/market_percentage' of wmtx/platform into release 
跳转汇总结算单默认事件添加
zhengyongxing 19c2f8b2de 跳转汇总结算单默认事件添加
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release 
跳转汇总结算单跳转修正，添加筛选发放状态的代码
zhengyongxing ced9d51845 跳转汇总结算单跳转修正，添加筛选发放状态的代码
廖金灵 6af9e39ec9 Merge branch 'feature/market_percentage' of wmtx/platform into release 
重算展示权限添加
zhengyongxing dae421270f 重算展示权限添加
廖金灵 262940a42f Merge branch 'feature/market_percentage' of wmtx/platform into release 
列表全部开发给市场专员，其他人员的数据隐
zhengyongxing 53979941a0 列表全部开发给市场专员，其他人员的数据隐藏
廖金灵 1ec683a86e Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成市场总监管理组添加查看全部用户的权限
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限
廖金灵 27f14f0292 Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成bug修改
zhengyongxing bded27756e 市场业绩提成bug修改
廖金灵 c008157b0a Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成bug修改
zhengyongxing 0c5e857ca2 市场业绩提成bug修改
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成bug修改
zhengyongxing 5ab96edd8f 市场业绩提成bug修改
zhengyongxing 8f4505205b 市场业绩提成优时间大小判断
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成优化
zhengyongxing b64e5858ea 市场业绩提成优化
zhengyongxing 5f113b8bfc 市场业绩提成优化
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release 
市场业绩提成优化
zhengyongxing 2975b9fe35 市场业绩提成优化
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release 
提现汇总表时间检索bug修正
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正
郑永星 a9e8905e27 Merge branch 'feature/market_percentage' of wmtx/platform into release 
提现汇总表时间检索bug修正
zhengyongxing 3eeeb449de 提现汇总表时间检索bug修正
zhengyongxing 4e562ffcc4 提现汇总表时间检索bug修正
廖金灵 8ad5533c53 Merge branch 'feature/market_percentage' of wmtx/platform into release 
汇率逻辑修改
zhengyongxing 0ac831dece 汇率逻辑修改
廖金灵 aebc8b9f70 Merge branch 'feature/market_percentage' of wmtx/platform into release 
编辑汇率时间控件修改
zhengyongxing a1df3c547e 编辑汇率时间控件修改
廖金灵 7576434beb Merge branch 'feature/market_percentage' of wmtx/platform into release 
时间控件修改
zhengyongxing 5dc5222091 时间控件修改
郑永星 7608fb3b99 Merge branch 'feature/market_percentage' of wmtx/platform into release
zhengyongxing c637d7a1d7 离职发放发放完成隐藏
廖金灵 6d6ec065b2 Merge branch 'hotfix/retention_down' of wmtx/platform into release 
修改导出bug
ELF a17bb698dc 修改bug
廖金灵 39af00fe0e Merge branch 'hotfix/retention_down' of wmtx/platform into release 
修改bug
ELF 2dadc11d09 修改bug
廖金灵 578087e50e Merge branch 'hotfix/retention_down' of wmtx/platform into release 
修改留存率
ELF fa4de7ece5 修改
zhengyongxing 585f523984 arpu分析bug修正
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加
zhengyongxing f4789a1534 市场专员业绩提成bug修正
zhengyongxing 3603f5fa21 市场专员业绩提成bug修正
zhengyongxing 944a424b3c 市场专员业绩提成bug修正
zhengyongxing 44feb6957d 市场专员业绩提成bug修正
zhengyongxing e4d1ced122 市场专员业绩提成bug修正
zhengyongxing b9255647f7 市场专员业绩提成汇总单检索 
修正
zhengyongxing 0ca629518d 市场专员业绩结算结构修改
zhengyongxing 5c76d1180d 市场专员业绩结算结构修改
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改
zhengyongxing 8053806801 市场专员业绩bug修改
zhengyongxing f7c11991ca 市场专员业绩bug修改
chenzhi 2a4541569d 优化列表显示
zhengyongxing 2303c439aa 市场专员业绩计页面修改
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time
chenzhi 63054ac0d8 优化订单校验
zhengyongxing de3d7d52b7 市场专员业绩计bug修正
chenzhi 04e13844c3 zancun
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
zhengyongxing 043ee29f54 市场专员业绩计bug修正
zhengyongxing 8430444b8e 市场专员业绩计bug修正
zhengyongxing 2da9821caf 市场专员业绩计算修正
zhengyongxing 9a23b5588b 市场专员业绩计算修正
zhengyongxing ea21948984 支付渠道bug修改
zhengyongxing 97161900ac 市场专员业绩管理bug修改
chenzhi c9d6b9859d 合并热更
chenzhi c18eb439c5 优化游戏获取逻辑
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改
zhengyongxing c96340afa9 市场专员业绩管理bug修改
chenzhi 048931ce9e 优化搜索3