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
|
4 years ago |
|
zhengyongxing
|
400a9b3ded
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
4 years ago |
chenzhi
|
97af14147e
|
优化下游个人结算
|
4 years ago |
万盟天下
|
f52cf8947a
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏生成多条及内充也计入
|
4 years ago |
|
zhengyongxing
|
cdb02aa821
|
补点游戏生成多条及内充也计入
|
4 years ago |
 廖金灵
|
ef891050c9
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
baba28fe04
|
修改
|
4 years ago |
郑永星
|
55f98ca8c5
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
删除提示修正
|
4 years ago |
|
zhengyongxing
|
623361cbde
|
删除提示修正
|
4 years ago |
|
郑永星
|
77e8161159
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
d35ce5694e
|
汇总删除修正
|
4 years ago |
|
zhengyongxing
|
f36469031e
|
删除修正
|
4 years ago |
|
zhengyongxing
|
c5e272fb36
|
删除功能修正
|
4 years ago |
陈志
|
5cb1963582
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化推广公司添加排序
|
4 years ago |
|
chenzhi
|
f169d65c1c
|
优化推广公司添加排序
|
4 years ago |
|
廖金灵
|
f850a45913
|
Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
优化推广后台资料专区
|
4 years ago |
|
ELF
|
a6d7adb87b
|
修改
|
4 years ago |
|
chenzhi
|
4a3cb6f6bb
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
郑永星
|
7469d22c36
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
比例空字符判断
|
4 years ago |
|
zhengyongxing
|
9579919375
|
比例空字符判断
|
4 years ago |
|
郑永星
|
d272c17fc6
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
特殊补点比例修正
|
4 years ago |
|
zhengyongxing
|
c1222cd46a
|
特殊补点比例修正
|
4 years ago |
|
zhengyongxing
|
a5090c3793
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
|
4 years ago |
|
zhengyongxing
|
7ef0f125c1
|
特殊补点删除功能提交
|
4 years ago |
|
zhengyongxing
|
47e373639d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
|
4 years ago |
|
廖金灵
|
6e34bf0dc0
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
公司支付宝打款修正
|
4 years ago |
|
zhengyongxing
|
ba1778c112
|
公司支付宝打款修正
|
4 years ago |
|
郑永星
|
c7ba3e3ba3
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点bug修正
|
4 years ago |
|
zhengyongxing
|
ab7ae80634
|
补点bug修正
|
4 years ago |
|
郑永星
|
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 |
|
万盟天下
|
c60d7c6671
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
上游导出修正
|
4 years ago |
|
郑永星
|
1d3db74b53
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
上游导出修正
|
4 years ago |
|
zhengyongxing
|
288078c959
|
上游导出修正
|
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 |
|
万盟天下
|
e130228c39
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
万盟天下
|
2f0ecf6302
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
8f4b86ee2e
|
优化
|
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 |
|
廖金灵
|
a6bc59dd53
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
测试
|
4 years ago |
|
ELF
|
1e5c0cca66
|
测试
|
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 |
|
chenzhi
|
175b2f92f7
|
优化绑定币搜索
|
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 |
|
陈志
|
3628dd630e
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
|
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 |
|
zhengyongxing
|
ae8cf5ad38
|
上游导出修正
|
4 years ago |
|
郑永星
|
7f3de4d901
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
|
4 years ago |
|
zhengyongxing
|
f0c425ae82
|
下游导出修正
|
4 years ago |
|
郑永星
|
f0153776c3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例功能修正
|
4 years ago |
|
郑永星
|
0010a39c76
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
3c6418425a
|
上游导出修正
|
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 |
|
zhengyongxing
|
4ed51cb112
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
c795e5de6c
|
优化下游个人汇总样式
|
4 years ago |
|
zhengyongxing
|
f4aeae340d
|
特殊补点功能修正
|
4 years ago |
|
zhengyongxing
|
565d3c9576
|
特殊补点功能修改
|
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
|
872de1ff73
|
上下游聚合打款信息修改
|
4 years ago |
|
zhengyongxing
|
b75e0725a1
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
9265d7c9b6
|
上下游聚合打款信息修改
|
4 years ago |
|
ELF
|
1fbb9f097e
|
ss
|
4 years ago |
|
ELF
|
53f2649d9a
|
ss
|
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
|
36d72848bb
|
优化市场专员
|
4 years ago |
|
chenzhi
|
a18df8c6fb
|
优化下游个人多比例结算
|
4 years ago |
|
ELF
|
7adabb54f9
|
修改
|
4 years ago |
|
chenzhi
|
ed66facc8f
|
优化结算查看
|
4 years ago |
|
elf@home
|
c40fbf3870
|
新增游戏自动授权
|
4 years ago |