Commit Graph

2050 Commits (926b8975f1db5846f47effd15c7b1c16b4a62e1b)

Author SHA1 Message Date
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
zhengyongxing f0cbe3cafb 周结算金额bug修改
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing e30cd2fea7 外团推广功能提交
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing f8a7d53ac8 外团推广功能提交
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
ELF 47ff398bf4 修改
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing 6b47baf59a 汇总编辑前端修改
ELF ae3e49b95f 修改
ELF f77505925f 修改
ELF f3771dfd2d 修改
ELF a10bb888da 修改bug
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 18c3e95f30 修改
ELF 8e4ba0e20e 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正
zhengyongxing 723b3c9fa2 汇总重算提示语修正
zhengyongxing e7b64f27f2 汇总重算提示语修正
郑永星 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修正
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加,公司绑定编辑开放
郑永星 d7edb41f44 Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
zhengyongxing 01df95637a 汇总bug修正
郑永星 b69bc8ef6a Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
zhengyongxing 3f78880f7d 汇总bug修正
chenzhi f311da5208 优化银行卡号不限制
zyx 5bec0ba91c 汇总状态的操作修改
zyx c99cad808c 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
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流程修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
zhengyongxing 0dd7bceb3f 特殊比例bug修正
ELF 19c782b053 解决冲突
zhengyongxing c06e53ab31 汇总bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
zhengyongxing a1ac92dc02 押金bug修正
ELF 268ea4e34d 修改
zhengyongxing ce0196afea 押金bug修正
zhengyongxing 465f095dc4 市场业绩bug修正
zhengyongxing 5c65f356b2 市场业绩开发类型修正
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
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位
zhengyongxing a86fab6bf6 聚合公司绑定功能修改
zhengyongxing 984619e310 汇总审批撤回bug修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
zhengyongxing 2cdc4e815b 下游公司cp比例修改
zhengyongxing 28f73f3140 公司比例格式修改
zhengyongxing 995a860016 汇总编辑功能修改
zhengyongxing c366fcfe4e 汇总编辑功能提交
zhengyongxing 825d4e51c9 聚合公司绑定功能修改
zhengyongxing e8e190a7eb 聚合公司绑定功能修改
zhengyongxing 4e9bde9c10 汇总编辑提交
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改
zhengyongxing d937dbad55 聚合公司绑定功能修改
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加
zhengyongxing 868889fe54 汇总编辑功能提交
zhengyongxing 58bd48997f 汇总编辑功能提交
ELF ad34536256 修改
zhengyongxing 0b745ea817 个人汇总添加退款
zhengyongxing ee2304d664 结算性质名词修改
zhengyongxing fedcbd605b bug修改
zhengyongxing ca03b8701f 聚合页面名称修改
zhengyongxing 518c902b2a 发起汇总修正
zhengyongxing ceef36a7d1 内部公司功能完善
zhengyongxing ab9be65422 内部公司功能提交
zhengyongxing 1f3b2d1ec7 Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item
zhengyongxing 0631c22c93 上游导出修正
zyx 570e476efb 公司添加是否为内部公司
zhengyongxing deeb4b865b 聚合汇总单代码提交
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 上游导出修正
廖金灵 ef891050c9 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
修改bug
ELF baba28fe04 修改
郑永星 55f98ca8c5 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
删除提示修正
zhengyongxing 623361cbde 删除提示修正
郑永星 77e8161159 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
zhengyongxing d35ce5694e 汇总删除修正
zhengyongxing f36469031e 删除修正
廖金灵 f850a45913 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
优化推广后台资料专区
ELF a6d7adb87b 修改
zhengyongxing 9579919375 比例空字符判断
zhengyongxing c1222cd46a 特殊补点比例修正
zhengyongxing 7ef0f125c1 特殊补点删除功能提交
zhengyongxing 47e373639d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
zhengyongxing ba1778c112 公司支付宝打款修正
廖金灵 5e2c093ea4 Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
zhengyongxing df3b058b91 补点比例非负数修正
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
zhengyongxing c7af3bdb1d 补点功能修正
zhengyongxing af5878a98f 补点游戏有流水的就给予展示
zhengyongxing 64e2517b93 支付渠道优化
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
万盟天下 2f0ecf6302 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
ELF 8f4b86ee2e 优化
zhengyongxing e94994993a 特殊补点无法重算限制
廖金灵 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 优化下游推广公司导出
郑永星 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
修改
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
zhengyongxing 5acd5197ae 小bug修改
ELF bdc23b7d90 修改
廖金灵 a6bc59dd53 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
测试
ELF 1e5c0cca66 测试
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
ELF 1fb2fa7e81 解决冲突
ELF 8d98bd5a36 优化
ELF d123f7b779 优化
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
chenzhi ae9d7f7574 优化重算按钮的出现
chenzhi 175b2f92f7 优化绑定币搜索
郑永星 e3850d18f5 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
zhengyongxing a146dd820a 平台结算导出与列表选项修改
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
ELF 0ff1089682 修改
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
ELF 3c3222ad26 测试订单优化
陈志 3628dd630e Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
ELF a18e4188bd 修改bug
zhengyongxing ae8cf5ad38 上游导出修正
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
zhengyongxing f0c425ae82 下游导出修正
郑永星 0010a39c76 Merge branch 'feature/company_export_change' of wmtx/platform into release
zhengyongxing 3c6418425a 上游导出修正
廖金灵 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
ELF 6e2fda1e26 解决冲突
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
zhengyongxing 23555f8d4d 特殊补点功能修改
chenzhi 9234919180 优化导出
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 4ed51cb112 上下游聚合打款信息修改
chenzhi c795e5de6c 优化下游个人汇总样式
zhengyongxing f4aeae340d 特殊补点功能修正
zhengyongxing 565d3c9576 特殊补点功能修改
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
chenzhi ce5a83e9bc 优化汇总导出错误
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
zhengyongxing 872de1ff73 上下游聚合打款信息修改
zhengyongxing b75e0725a1 特殊补点功能修改
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改
ELF 1fbb9f097e ss
ELF 53f2649d9a ss
ELF 32bc839dcd 合并
ELF e0bbec0978 修改
chenzhi 180332ab87 优化下游未汇总导出
ELF ad2037408d 优化
chenzhi 4a98c587fa 新增线下打款确认
ELF e441f030c0 优化
chenzhi 69cf42e895 新增线下确认打款
ELF 9b88e97672 修改
chenzhi e2d179acd8 新增线下打款
zhengyongxing 9000533644 下游公司功能提交
ELF 1a14ed8dc7 修改
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
chenzhi 79468aa6f2 新增结算删除
ELF 42547128d4 优化押金
chenzhi 36d72848bb 优化市场专员
ELF 7adabb54f9 修改
elf@home 50755b89c5 修改
zyx 89801c1467 特殊补点功能完善
zhengyongxing e6bc6853aa 特殊补点结算功能添加
ELF cc6c5d4e74 修改
chenzhi 6e49bcc353 优化财务汇总
ELF 2867a05bb3 修改
chenzhi f0e43df7c2 新增重算
ELF 0923006a20 修改
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
elf@home f8f9046a87 提交
chenzhi 03341a7d9f 优化游戏资质展示
chenzhi e94c452f85 取消结算单的管理员审核
zhengyongxing 250d2ac2c0 市场业绩毛利修改
zhengyongxing b5e49e850d 上下游聚合打款信息修改
chenzhi fc05c274c4 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi 2b2acf833c 优化重复添加
chenzhi f91db42a57 优化下游导出2
chenzhi 901198f546 优化下游个人信息
chenzhi b74b5ecfad 优化下游结算与导出
ELF d30ef409fc 优化
ELF fa9d330603 修改
廖金灵 db4fc9699c Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
chenzhi 7eee79a867 优化导出
zhengyongxing 62f4ce3362 上下游聚合打款信息修改
chenzhi d63edee6b3 优化结算单界面信息
chenzhi 51778a2a73 优化下游公司导出及汇总
chenzhi d7a9663d46 优化上游不结算
chenzhi 180e21be86 优化结算上游结算为一单
chenzhi ec7b333fa4 优化下游个人打款设置
chenzhi ea7bafec91 优化下游重算
chenzhi 7beaff1825 优化下游个人汇总查看
zhengyongxing bd9af09830 市场结算管理bug修正
chenzhi 4143a67238 优化下游个人导出
廖金灵 c53abd3114 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
chenzhi 372958f45d 优化添加关系的开票内容
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
zhengyongxing 22961561d4 充值订单充值状态增加
chenzhi 0fd5bc7fe8 优化汇总时间显示
chenzhi b9567f6faf 优化时间戳模式
chenzhi a90149b31b 隐藏会长结算方式
chenzhi 12f232219c 优化下游个人查看
chenzhi 71d0d2c9d1 优化个人显示支付方式
chenzhi 52345e4eb1 优化导出新增支付宝信息
廖金灵 8c942dbcbc Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
zyx 3c8f637240 平台币导出增加商户
zyx 896cdd92b9 平台币增加商户
yulingwei 9cdab21db9 repair search
陈志 890499ce59 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 4a44604047 优化渠道汇总
郑永星 c55b798bb4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 1f6c96e3a9 bug修改
廖金灵 613b50eb63 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zyx 2a236849b8 充值信息查看权限默认开启
zhengyongxing f18db12d69 支付渠道跳转增加
廖金灵 c8af2d79ff Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
廖金灵 a2474aaa0b Merge branch 'feature/reward' of wmtx/platform into release
修改时间
yulingwei b1a91339cb Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
yulingwei 1634f14fb2 upt
yulingwei a01beb9bc6 upt
郑永星 f01030ffaa Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing d9d66dc5bf 支付渠道跳转增加