zhengyongxing
|
64e2517b93
|
支付渠道优化
|
4 years ago |
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
4 years ago |
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
万盟天下
|
2f0ecf6302
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
|
4 years ago |
 ELF
|
8f4b86ee2e
|
优化
|
4 years ago |
|
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
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 |
郑永星
|
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 |
|
郑永星
|
ff1117c0b7
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
5acd5197ae
|
小bug修改
|
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 |
|
陈志
|
e1db5c9a47
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
|
4 years ago |
|
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
|
chenzhi
|
175b2f92f7
|
优化绑定币搜索
|
4 years ago |
|
郑永星
|
e3850d18f5
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
|
4 years ago |
|
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
|
廖金灵
|
429ded27b8
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
0ff1089682
|
修改
|
4 years ago |
|
廖金灵
|
7436e7c89d
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
|
4 years ago |
|
ELF
|
3c3222ad26
|
测试订单优化
|
4 years ago |
|
陈志
|
3628dd630e
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
|
4 years ago |
|
廖金灵
|
151fa30be5
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
|
4 years ago |
|
ELF
|
a18e4188bd
|
修改bug
|
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 |
|
郑永星
|
0010a39c76
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
3c6418425a
|
上游导出修正
|
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 |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
廖金灵
|
3690b7d000
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
|
4 years ago |
|
zhengyongxing
|
23555f8d4d
|
特殊补点功能修改
|
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
|
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 |
|
chenzhi
|
ce5a83e9bc
|
优化汇总导出错误
|
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 |
|
ELF
|
e0bbec0978
|
修改
|
4 years ago |
|
chenzhi
|
180332ab87
|
优化下游未汇总导出
|
4 years ago |
|
ELF
|
ad2037408d
|
优化
|
4 years ago |
|
chenzhi
|
4a98c587fa
|
新增线下打款确认
|
4 years ago |
|
ELF
|
e441f030c0
|
优化
|
4 years ago |
|
chenzhi
|
69cf42e895
|
新增线下确认打款
|
4 years ago |
|
ELF
|
9b88e97672
|
修改
|
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
|
79468aa6f2
|
新增结算删除
|
4 years ago |
|
ELF
|
42547128d4
|
优化押金
|
4 years ago |
|
chenzhi
|
36d72848bb
|
优化市场专员
|
4 years ago |
|
ELF
|
7adabb54f9
|
修改
|
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
|
6e49bcc353
|
优化财务汇总
|
4 years ago |
|
ELF
|
2867a05bb3
|
修改
|
4 years ago |
|
chenzhi
|
f0e43df7c2
|
新增重算
|
4 years ago |
|
ELF
|
0923006a20
|
修改
|
4 years ago |
|
chenzhi
|
f5ad1a6d0c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
elf@home
|
f8f9046a87
|
提交
|
4 years ago |
|
chenzhi
|
03341a7d9f
|
优化游戏资质展示
|
4 years ago |
|
chenzhi
|
e94c452f85
|
取消结算单的管理员审核
|
4 years ago |
|
zhengyongxing
|
250d2ac2c0
|
市场业绩毛利修改
|
4 years ago |
|
zhengyongxing
|
b5e49e850d
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
fc05c274c4
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
2b2acf833c
|
优化重复添加
|
4 years ago |
|
chenzhi
|
f91db42a57
|
优化下游导出2
|
4 years ago |
|
chenzhi
|
901198f546
|
优化下游个人信息
|
4 years ago |
|
chenzhi
|
b74b5ecfad
|
优化下游结算与导出
|
4 years ago |
|
ELF
|
d30ef409fc
|
优化
|
4 years ago |
|
ELF
|
fa9d330603
|
修改
|
4 years ago |
|
廖金灵
|
db4fc9699c
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
|
4 years ago |
|
chenzhi
|
7eee79a867
|
优化导出
|
4 years ago |
|
zhengyongxing
|
62f4ce3362
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
d63edee6b3
|
优化结算单界面信息
|
4 years ago |
|
chenzhi
|
51778a2a73
|
优化下游公司导出及汇总
|
4 years ago |
|
chenzhi
|
d7a9663d46
|
优化上游不结算
|
4 years ago |
|
chenzhi
|
180e21be86
|
优化结算上游结算为一单
|
4 years ago |
|
chenzhi
|
ec7b333fa4
|
优化下游个人打款设置
|
4 years ago |
|
chenzhi
|
ea7bafec91
|
优化下游重算
|
4 years ago |
|
chenzhi
|
7beaff1825
|
优化下游个人汇总查看
|
4 years ago |
|
zhengyongxing
|
bd9af09830
|
市场结算管理bug修正
|
4 years ago |
|
chenzhi
|
4143a67238
|
优化下游个人导出
|
4 years ago |
|
廖金灵
|
c53abd3114
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
|
4 years ago |
|
chenzhi
|
372958f45d
|
优化添加关系的开票内容
|
4 years ago |
|
廖金灵
|
0665e8265a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
|
4 years ago |
|
zhengyongxing
|
22961561d4
|
充值订单充值状态增加
|
4 years ago |
|
chenzhi
|
0fd5bc7fe8
|
优化汇总时间显示
|
4 years ago |
|
chenzhi
|
b9567f6faf
|
优化时间戳模式
|
4 years ago |
|
chenzhi
|
a90149b31b
|
隐藏会长结算方式
|
4 years ago |
|
chenzhi
|
12f232219c
|
优化下游个人查看
|
4 years ago |
|
chenzhi
|
71d0d2c9d1
|
优化个人显示支付方式
|
4 years ago |
|
chenzhi
|
52345e4eb1
|
优化导出新增支付宝信息
|
4 years ago |
|
廖金灵
|
8c942dbcbc
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
|
4 years ago |
|
zyx
|
3c8f637240
|
平台币导出增加商户
|
4 years ago |
|
zyx
|
896cdd92b9
|
平台币增加商户
|
4 years ago |
yulingwei
|
9cdab21db9
|
repair search
|
4 years ago |
|
陈志
|
890499ce59
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
4a44604047
|
优化渠道汇总
|
4 years ago |
|
郑永星
|
c55b798bb4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
1f6c96e3a9
|
bug修改
|
4 years ago |
|
廖金灵
|
613b50eb63
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zyx
|
2a236849b8
|
充值信息查看权限默认开启
|
4 years ago |
|
zhengyongxing
|
f18db12d69
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
c8af2d79ff
|
Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
|
4 years ago |
|
廖金灵
|
a2474aaa0b
|
Merge branch 'feature/reward' of wmtx/platform into release
修改时间
|
4 years ago |
|
yulingwei
|
b1a91339cb
|
Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
|
4 years ago |
|
yulingwei
|
1634f14fb2
|
upt
|
4 years ago |
|
yulingwei
|
a01beb9bc6
|
upt
|
4 years ago |
|
郑永星
|
f01030ffaa
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
d9d66dc5bf
|
支付渠道跳转增加
|
4 years ago |
|
陈志
|
575c074c39
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
b63369cdba
|
优化结算方式查询
|
4 years ago |
|
chenzhi
|
c6b3d1948e
|
优化打款剔除后显示
|
4 years ago |
|
廖金灵
|
86b8682d02
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zhengyongxing
|
0c4f1f05bd
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
fc7284de94
|
Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
|
4 years ago |
|
陈志
|
f63985ece1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
|
4 years ago |
|
zhengyongxing
|
9a722d5b45
|
市场结算管理bug修改
|
4 years ago |
|
yulingwei
|
9e53db53cd
|
upt
|
4 years ago |
|
yulingwei
|
de0fc5e074
|
upt
|
4 years ago |
|
chenzhi
|
aabc0703df
|
优化结算时间选择
|
4 years ago |
|
chenzhi
|
8b8b0721b3
|
优化结算时间
|
4 years ago |