2866 Commits (f490f10ee5490808e098d6b0026a7d2feacd6794)

Author SHA1 Message Date
郑永星 2e4904861b Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
特殊补点功能bug修正
4 years ago
zhengyongxing 65dc1dec9e 特殊补点功能bug修正 4 years ago
chenzhi 7a135f1019 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
廖金灵 5e2c093ea4 Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
4 years ago
郑永星 b65b8c6b2f Merge branch 'hotfix/payStatistic' of wmtx/platform into release
判定是否录入过修正
4 years ago
zhengyongxing 229d8d2a50 判定是否录入过修正 4 years ago
郑永星 a80f68ef5e Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点比例非负数修正
4 years ago
zhengyongxing df3b058b91 补点比例非负数修正 4 years ago
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
4 years ago
郑永星 98563b686d Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点功能修正
4 years ago
zhengyongxing c7af3bdb1d 补点功能修正 4 years ago
chenzhi bcdbb3d0a0 优化导出保留两位小数 4 years ago
zhengyongxing c0406a6f52 上游导出修正 4 years ago
chenzhi e085b6cc78 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi f73a9033b3 新增下游个人比例 4 years ago
廖金灵 1b9aa5c87e Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏有流水的就给予展示
4 years ago
zhengyongxing af5878a98f 补点游戏有流水的就给予展示 4 years ago
廖金灵 de3477dd27 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点功能修正
4 years ago
zhengyongxing b39629fe08 补点功能修正 4 years ago
郑永星 223c3a63f2 Merge branch 'hotfix/payStatistic' of wmtx/platform into release
支付渠道优化
4 years ago
zhengyongxing 64e2517b93 支付渠道优化 4 years ago
chenzhi 329c5696d6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总 4 years ago
郑永星 c9497ee3f3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
4 years ago
zhengyongxing 3adf8a93f8 比例格式修正 4 years ago
chenzhi e10b27a067 优化下游内团江息网络归属 4 years ago
万盟天下 956d6c35a7 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
4 years ago
万盟天下 9d6b18009a Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
4 years ago
ELF 4bb7015e1b 测试 4 years ago
万盟天下 25c06c4b2d Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改功能
4 years ago
万盟天下 eb7346c4a9 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
权限优化
4 years ago
ELF f37f6c51dd 修改功能 4 years ago
chenzhi 2ff538886c 优化上游结算 4 years ago
郑永星 700841fe7f Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点与其他汇总重算功能区分添加限制
4 years ago
chenzhi 75c7b635b6 优化上游结算检索 4 years ago
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
4 years ago
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制 4 years ago
郑永星 7a9a12f99c Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点无法重算限制
4 years ago
zhengyongxing e94994993a 特殊补点无法重算限制 4 years ago
郑永星 c4ea44c3f8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点权限
4 years ago
廖金灵 ef5c95f49a Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
4 years ago
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
4 years ago
ELF 1b949af7f5 优化 4 years ago
廖金灵 cf821ae447 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
4 years ago
zhengyongxing ba80668560 特殊补点权限 4 years ago
chenzhi 9c11344906 优化下游推广公司导出 4 years ago
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
4 years ago
zhengyongxing 1c08d1a221 比例格式修正 4 years ago
郑永星 10e50b4bec Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
4 years ago
zhengyongxing f18f3ce7e2 比例与日期格式修正 4 years ago
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
陈志 4813e28fec Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总说明
4 years ago
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
4 years ago
zhengyongxing 5acd5197ae 小bug修改 4 years ago
chenzhi b899ff7af7 优化汇总说明 4 years ago
ELF bdc23b7d90 修改 4 years ago
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
4 years ago
ELF 1fb2fa7e81 解决冲突 4 years ago
ELF 8d98bd5a36 优化 4 years ago
ELF d123f7b779 优化 4 years ago
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
郑永星 e554d9c288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点加入下游结算中
4 years ago
zhengyongxing 19c7f7db0d 特殊补点加入下游结算中 4 years ago
郑永星 1aebf2b939 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
4 years ago
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正 4 years ago
ELF 268e084241 修改 4 years ago
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
4 years ago
chenzhi ae9d7f7574 优化重算按钮的出现 4 years ago
郑永星 7c5ec40288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
4 years ago
zhengyongxing a29a8e43ff 特殊补点bug修正 4 years ago
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
4 years ago
ELF 9d67a4c842 优化 4 years ago
郑永星 e3850d18f5 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
4 years ago
zhengyongxing a146dd820a 平台结算导出与列表选项修改 4 years ago
chenzhi 8baab09004 优化备注 4 years ago
陈志 aa2feb7e1e Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化海南结算
4 years ago
chenzhi 927c5b8595 优化海南结算 4 years ago
chenzhi a3a3505894 新增官方渠道结算 4 years ago
郑永星 9f0f9b7951 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员业绩下游流水及特殊补点功能提交
4 years ago
zhengyongxing b14d2d197c 市场专员业绩下游流水及特殊补点功能提交 4 years ago
廖金灵 d29ec01ab6 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
4 years ago
ELF b9779df6b1 修改 4 years ago
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
4 years ago
ELF 0ff1089682 修改 4 years ago
廖金灵 c633109176 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
留存率不区分设备
4 years ago
ELF 619e1de3f3 留存率不区分设备 4 years ago
陈志 c1fbda369b Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化财务汇总测试收入
4 years ago
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
4 years ago
ELF 3c3222ad26 测试订单优化 4 years ago
chenzhi eb2cd7d50f 优化财务汇总测试收入 4 years ago
陈志 d130e6cf6d Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人汇总导出异常
4 years ago
chenzhi f405faa924 优化个人汇总导出异常 4 years ago
陈志 053d1de648 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人结算
4 years ago
chenzhi 1a55fbce69 优化个人结算 4 years ago
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
4 years ago
ELF a18e4188bd 修改bug 4 years ago
chenzhi 05f11648a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
郑永星 f0153776c3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例功能修正
4 years ago
zhengyongxing 3b2ddded90 特殊比例功能修正 4 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
ELF 6596e01a29 修改 4 years ago
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
4 years ago
chenzhi 31af865a9f 优化线下打款确认 4 years ago
郑永星 3bc318daf3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例申请功能提交
4 years ago
zhengyongxing 418d5a6bda 特殊比例申请功能提交 4 years ago
ELF 6e2fda1e26 解决冲突 4 years ago
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
4 years ago
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
4 years ago
zhengyongxing 23555f8d4d 特殊补点功能修改 4 years ago
zhengyongxing 0215082018 特殊补点bug修正 4 years ago
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing cd331f2c64 上下游聚合打款信息修改 4 years ago
chenzhi 9234919180 优化导出 4 years ago
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
zhengyongxing 2c005d1996 特殊补点汇总功能修改 4 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 4 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 4 years ago
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
zhengyongxing 50495e73ca 特殊补点功能修改 4 years ago
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
ELF 32bc839dcd 合并 4 years ago
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
4 years ago
ELF e0bbec0978 修改 4 years ago
chenzhi 57b692cd67 优化上游添加错误 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
ELF ad2037408d 优化 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
ELF 9b88e97672 修改 4 years ago
ELF 296e378501 修改 4 years ago
ELF e4854aca3a 修改 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
chenzhi b35d0a0e95 新增删除日志 4 years ago
chenzhi 79468aa6f2 新增结算删除 4 years ago
ELF 34a22d65bf 修改 4 years ago
ELF 42547128d4 优化押金 4 years ago
chenzhi a18df8c6fb 优化下游个人多比例结算 4 years ago
ELF 7adabb54f9 修改 4 years ago
chenzhi ed66facc8f 优化结算查看 4 years ago
elf@home c40fbf3870 新增游戏自动授权 4 years ago
elf@home 50755b89c5 修改 4 years ago
zyx 89801c1467 特殊补点功能完善 4 years ago
zhengyongxing e6bc6853aa 特殊补点结算功能添加 4 years ago
ELF cc6c5d4e74 修改 4 years ago
chenzhi ff19f3259f 优化下游公司多比例结算 4 years ago
chenzhi 492d7a8f73 优化获取比例 4 years ago
chenzhi f5fb65e400 新增获取公司游戏比例 4 years ago
chenzhi 8e2f07db38 优化系统任务注释 4 years ago
chenzhi 4f70b89063 优化系统任务执行 4 years ago
chenzhi b88f2986bd 优化重算,兼容wind 4 years ago
chenzhi 7ceafb1d42 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 62b566e8b8 优化地址填写 4 years ago
chenzhi f0e43df7c2 新增重算 4 years ago
chenzhi fb75494c64 新增系统执行命令方法 4 years ago
ELF 0923006a20 修改 4 years ago
廖金灵 35d34d1864 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
4 years ago
ELF c7390f4c2e bug修复 4 years ago
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
4 years ago
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 04ac1da1d7 优化公司控制会长游戏规则 4 years ago
ELF 550da5cb37 测试 4 years ago
chenzhi e8eb963fc1 修正公司取消游戏推广员无效 4 years ago
elf@home f8f9046a87 提交 4 years ago
chenzhi 3efc4daee6 优化跟随 4 years ago
chenzhi c137a10c8f 优化游戏数据跟随 4 years ago
chenzhi 03341a7d9f 优化游戏资质展示 4 years ago
chenzhi 6560047a11 yh 4 years ago
chenzhi e94c452f85 取消结算单的管理员审核 4 years ago
zhengyongxing 250d2ac2c0 市场业绩毛利修改 4 years ago
ELF 06c4d5f1f1 优化测试资源 4 years ago
zhengyongxing b5e49e850d 上下游聚合打款信息修改 4 years ago
chenzhi fbf6948367 优化推广员整合 4 years ago
chenzhi fc05c274c4 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
ELF 66bffbff99 吸怪 4 years ago
ELF fa90dc0bc8 修改 4 years ago
chenzhi 2b2acf833c 优化重复添加 4 years ago
chenzhi 7c2ada7e17 优化个人导出 4 years ago
chenzhi b74b5ecfad 优化下游结算与导出 4 years ago
chenzhi 84a665a2ab Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 963802dc1c 优化下游个人结算 4 years ago
chenzhi c110284ad9 优化个人结算多会长 4 years ago
ELF c9cd377d4f 修改 4 years ago
ELF fa9d330603 修改 4 years ago
廖金灵 db4fc9699c Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
4 years ago
ELF 9c59ba06e2 修改 4 years ago
zhengyongxing 62f4ce3362 上下游聚合打款信息修改 4 years ago
chenzhi 0a136fbbde 优化结算页面时间显示 4 years ago
chenzhi 0a049e0391 优化下游公司导出 4 years ago
chenzhi 51778a2a73 优化下游公司导出及汇总 4 years ago
ELF 3383b3d2d9 修改 4 years ago
chenzhi c1b5b2f716 优化上游导出公式 4 years ago
chenzhi d7a9663d46 优化上游不结算 4 years ago
chenzhi 180e21be86 优化结算上游结算为一单 4 years ago
zhengyongxing 8cc9bdb0c6 市场结算管理市场业绩公式修正 4 years ago
chenzhi b3813dad4a 优化公司单子为一单 4 years ago
zhengyongxing d5e7546c51 市场结算管理市场业绩公式修正 4 years ago
chenzhi ec7b333fa4 优化下游个人打款设置 4 years ago
chenzhi aa6faf7280 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/change_dabase_bank 4 years ago
chenzhi cd5c6e7202 删除数据库操作功能 4 years ago
chenzhi 62f91bb0df 优化 4 years ago
chenzhi 027b1f2c08 合并ma 4 years ago
chenzhi 98f2711f86 合并mas 4 years ago
chenzhi ea7bafec91 优化下游重算 4 years ago
chenzhi 7beaff1825 优化下游个人汇总查看 4 years ago
chenzhi 95b464f636 取消公司读取会长阿里信息 4 years ago
chenzhi 9b78b8b461 优化下游个人结算 4 years ago
chenzhi 141951467c 优化个人重算用户bug 4 years ago
zhengyongxing ccca696de2 市场结算管理bug修正 4 years ago
zhengyongxing a140a4c9d5 市场结算管理bug修正 4 years ago
ELF 49751b8760 测试资源修改 4 years ago
chenzhi 88a129f06c 优化重算 4 years ago
chenzhi 5db1f7ce24 优化比例显示 4 years ago
zhengyongxing bd9af09830 市场结算管理bug修正 4 years ago
chenzhi 9ee69f9bd4 优化下游结算单导出 4 years ago
chenzhi 07fd53a6aa 优化上游导出文件格式及时间问题 4 years ago
zhengyongxing c72d60b37d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 4 years ago
zyx 223c69797c 平台币导出bug修正 4 years ago
chenzhi b2239380bf 优化负数结算规则 4 years ago
chenzhi 978a42b4df 优化结算流水判定依旧平台流水 4 years ago
chenzhi 7335f5da15 上下游非0都要结算 4 years ago
chenzhi ecf92c03a7 合并 4 years ago
chenzhi 9b61a39620 优化游戏统计导出时间问题 4 years ago
chenzhi ba20c3683a 优化游戏统计时间 4 years ago
陈志 97f79a9c0f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into release 4 years ago
chenzhi 4c1a03b7c7 优化结算流水及汇总金额300判定 4 years ago
廖金灵 194523f00f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游cp结算比例问题
4 years ago
chenzhi ca7f92573b 优化上游cp结算比例问题 4 years ago
廖金灵 a45b12ed3f Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
4 years ago
ELF 672b276228 修改bug 4 years ago
廖金灵 6145745a01 Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改游戏统计
4 years ago
ELF b71c81d764 修改bug 4 years ago
廖金灵 49365c790d Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游比例获取
4 years ago
chenzhi 9d9eae85ec 优化上游比例获取 4 years ago
chenzhi 47e57f48e6 优化审批文字错误 4 years ago
廖金灵 7d676b406f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游查看
4 years ago
chenzhi c57c40535b 优化下游查看 4 years ago
廖金灵 5855973c67 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游结算为支付时间
4 years ago
chenzhi 651aa6cc8b 优化参数不足 4 years ago
chenzhi 071c8c78f4 优化下游结算为新增时间 4 years ago
廖金灵 a36123059c Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化聚合渠道统计
4 years ago
chenzhi 884f919387 优化聚合渠道统计 4 years ago
廖金灵 a05770557b Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化汇总时间显示
4 years ago