yulingwei
|
08c4d82b00
|
upt
|
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 |
|
chenzhi
|
0fd5bc7fe8
|
优化汇总时间显示
|
4 years ago |
|
chenzhi
|
b9567f6faf
|
优化时间戳模式
|
4 years ago |
|
chenzhi
|
724fe9e60f
|
优化导出市场专员
|
4 years ago |
|
廖金灵
|
54f933aba1
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
95672ffc90
|
修改bug
|
4 years ago |
|
廖金灵
|
637f22c22b
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
8e40b43696
|
修改bug
|
4 years ago |
|
ELF
|
83a1d34b2c
|
修改bug
|
4 years ago |
|
廖金灵
|
3d36fbb00d
|
Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
7445125745
|
修改bug
|
4 years ago |
|
廖金灵
|
edae05c50e
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化结算
|
4 years ago |
|
chenzhi
|
f3b145f930
|
优化未结算查询
|
4 years ago |
|
chenzhi
|
f7581f3504
|
优化结算小于0依旧结算
|
4 years ago |
|
ELF
|
6ac8a0a9b3
|
修改bug
|
4 years ago |
|
ELF
|
0ee5ea3c02
|
修改bug
|
4 years ago |
|
chenzhi
|
a90149b31b
|
隐藏会长结算方式
|
4 years ago |
|
chenzhi
|
12f232219c
|
优化下游个人查看
|
4 years ago |
|
chenzhi
|
71d0d2c9d1
|
优化个人显示支付方式
|
4 years ago |
|
ELF
|
7471dcf338
|
取消调试代码
|
4 years ago |
|
ELF
|
e34d28e2c8
|
修改
|
4 years ago |
|
chenzhi
|
52345e4eb1
|
优化导出新增支付宝信息
|
4 years ago |
|
chenzhi
|
3fc9b578a9
|
优化个人重算
|
4 years ago |
|
chenzhi
|
553ee7a752
|
优化获取
|
4 years ago |
|
chenzhi
|
007ca52afa
|
优化个人比例获取方式
|
4 years ago |
|
chenzhi
|
9b32f0cd0e
|
优化获取cp比例
|
4 years ago |
|
廖金灵
|
406d1c47d4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
|
4 years ago |
zyx
|
9df721d1f5
|
平台币导出bug修正
|
4 years ago |
|
廖金灵
|
8c942dbcbc
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
|
4 years ago |
|
zyx
|
3c8f637240
|
平台币导出增加商户
|
4 years ago |
|
zyx
|
bbb7f3301c
|
平台币导出增加商户
|
4 years ago |
|
zyx
|
896cdd92b9
|
平台币增加商户
|
4 years ago |
|
廖金灵
|
20a2184521
|
Merge branch 'hotfix/platform_statistic_search' of wmtx/platform into master
统计搜索优化
|
4 years ago |
|
yulingwei
|
8d36e35271
|
upt
|
4 years ago |
|
廖金灵
|
1440856626
|
Merge branch 'hotfix/add_prompte_relation' of wmtx/platform into master
优化新增会长关系不跟随
|
4 years ago |
|
chenzhi
|
5f1afdef9f
|
优化新增会长关系不跟随
|
4 years ago |
|
廖金灵
|
0e878884bb
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场业绩bug修改，权限添加
|
4 years ago |
|
zhengyongxing
|
1bea859fd4
|
市场业绩bug修改，权限添加
|
4 years ago |
|
yulingwei
|
9cdab21db9
|
repair search
|
4 years ago |
|
廖金灵
|
79b0f3224d
|
Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改权限控制
|
4 years ago |
|
ELF
|
cbd3bc7362
|
修改
|
4 years ago |
陈志
|
e8e9035c08
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
51fb6a3ebd
|
优化打款配置
|
4 years ago |
|
陈志
|
281bcc7638
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
16f8bead31
|
优化打款
|
4 years ago |
|
chenzhi
|
7902df54e4
|
优化测试站不打款
|
4 years ago |
|
廖金灵
|
32bdbbfc39
|
Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改session过期时间
|
4 years ago |
|
ELF
|
81a706e809
|
修改session过期时间
|
4 years ago |
|
chenzhi
|
bbd29dcebb
|
移除打款配置
|
4 years ago |
|
陈志
|
890499ce59
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
52419ae22a
|
优化上游不结算金额
|
4 years ago |
|
chenzhi
|
700a69b947
|
优化打款导出不体现公式
|
4 years ago |
|
chenzhi
|
4a44604047
|
优化渠道汇总
|
4 years ago |
|
chenzhi
|
b73e3fea84
|
优化财务汇总统计
|
4 years ago |
|
chenzhi
|
0c11ddb004
|
优化聚合数据
|
4 years ago |
|
chenzhi
|
98c8c7ee1e
|
优化测试服订单
|
4 years ago |
郑永星
|
c55b798bb4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
1f6c96e3a9
|
bug修改
|
4 years ago |
|
zhengyongxing
|
05d3ba9c23
|
财务汇总统计bug修改
|
4 years ago |
|
zhengyongxing
|
e67538fcef
|
财务汇总统计bug修改汇总统计修改
|
4 years ago |
|
zhengyongxing
|
c6570fee01
|
财务汇总统计bug修改汇总统计修改
|
4 years ago |
|
zhengyongxing
|
38da7f005d
|
汇总统计修改
|
4 years ago |
|
chenzhi
|
13efc01d3d
|
优化财务汇总
|
4 years ago |
|
chenzhi
|
f0d20598de
|
新增商户权限
|
4 years ago |
|
chenzhi
|
ef4702fb46
|
暂存
|
4 years ago |
|
郑永星
|
fe4a029ce4
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
1372b5b15d
|
Merge remote-tracking branch 'origin/hotfix/market_percentage' into hotfix/market_percentage
|
4 years ago |
|
zhengyongxing
|
7aa031bbb4
|
市场结算管理优化
|
4 years ago |
|
chenzhi
|
3b3ed208e2
|
财务汇总新增测试订单收入
|
4 years ago |
|
chenzhi
|
837c09716d
|
财务汇总-支付时间
|
4 years ago |
|
廖金灵
|
37a84b8ce7
|
Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
|
4 years ago |
|
zhengyongxing
|
f9503182da
|
市场结算管理优化
|
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 |
|
廖金灵
|
697dad95c8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zhengyongxing
|
4c582e51c7
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
d6790fdf6c
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
|
4 years ago |
|
yulingwei
|
08400bd67a
|
upt
|
4 years ago |
|
廖金灵
|
86b8682d02
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zhengyongxing
|
0c4f1f05bd
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
f543804c87
|
Merge branch 'feature/promote_base_info' of wmtx/platform into release
用户信息
|
4 years ago |
|
yulingwei
|
deaa20c5bf
|
upt
|
4 years ago |
|
廖金灵
|
fc7284de94
|
Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
|
4 years ago |
|
廖金灵
|
c114446d55
|
Merge branch 'feature/promote_base_info' of wmtx/platform into release
用户基本信息
|
4 years ago |
|
廖金灵
|
d73ab9c4cd
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
|
4 years ago |
|
陈志
|
f63985ece1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
|
4 years ago |
|
ELF
|
a4d4a51a2c
|
完善支付商户操作日志
|
4 years ago |
|
chenzhi
|
3318298d2e
|
优化上下游导出时间
|
4 years ago |
|
zhengyongxing
|
9a722d5b45
|
市场结算管理bug修改
|
4 years ago |
|
yulingwei
|
c308bbbd6c
|
upt
|
4 years ago |
|
yulingwei
|
9e53db53cd
|
upt
|
4 years ago |
|
yulingwei
|
de0fc5e074
|
upt
|
4 years ago |
|
chenzhi
|
205c6a83f8
|
优化上游结算
|
4 years ago |
|
chenzhi
|
6f75b0e6d8
|
优化结算单无地址
|
4 years ago |
|
yulingwei
|
19c3aeec50
|
Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info
|
4 years ago |
|
yulingwei
|
a88b182641
|
upt
|
4 years ago |
|
chenzhi
|
493197fed2
|
优化重新结算
|
4 years ago |
|
chenzhi
|
91510679b0
|
Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
|
4 years ago |
|
chenzhi
|
aabc0703df
|
优化结算时间选择
|
4 years ago |
|
chenzhi
|
8b8b0721b3
|
优化结算时间
|
4 years ago |
|
chenzhi
|
853c938edb
|
优化下游个人结算时间
|
4 years ago |
|
chenzhi
|
92ccc96dcd
|
优化下游公司结算时间审核
|
4 years ago |
|
chenzhi
|
a14f0abb88
|
上游新增结算时间判断
|
4 years ago |
|
廖金灵
|
57ea4efb72
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
|
4 years ago |
|
zhengyongxing
|
8c237e19fe
|
充值订单bug修改
|
4 years ago |
|
廖金灵
|
79f038d62a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
|
4 years ago |
|
zhengyongxing
|
24bcd381a0
|
支付商户bug修改
|
4 years ago |
|
廖金灵
|
782f2ae51b
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
|
4 years ago |
|
廖金灵
|
3c4cf05a72
|
Merge branch 'feature/reward' of wmtx/platform into release
列表样式
|
4 years ago |
|
zhengyongxing
|
eb66cfd5d4
|
支付商户bug修改
|
4 years ago |
|
yulingwei
|
d46fa808c0
|
upt
|
4 years ago |
|
陈志
|
67dc1b58e6
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
0f284cf9b3
|
优化游戏绑定，已经绑定不出现
|
4 years ago |
|
廖金灵
|
4b6218f1aa
|
Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
|
4 years ago |
|
廖金灵
|
bd00e90c26
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
|
4 years ago |
|
ELF
|
bc193e648e
|
修改
|
4 years ago |
|
yulingwei
|
f598b19957
|
Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward
|
4 years ago |
|
yulingwei
|
b995ba34d9
|
upt
|
4 years ago |
|
zhengyongxing
|
19f59d6482
|
菜单栏修改
|
4 years ago |
|
zhengyongxing
|
eebb38dc8c
|
商户列表字段名称修改
|
4 years ago |
|
zhengyongxing
|
9d28947f9b
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
624a2b7cde
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
9a202a393e
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
4 years ago |
|
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
4 years ago |
|
廖金灵
|
6faa6e0a33
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
|
4 years ago |
|
廖金灵
|
7340d5b4fd
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
|
4 years ago |
|
chenzhi
|
2a99226dd7
|
优化订单列表长cp订单显示
|
4 years ago |
|
zhengyongxing
|
45d124b4cd
|
手机号码重复验证
|
4 years ago |
|
廖金灵
|
47c565e31c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
|
4 years ago |
|
zhengyongxing
|
57903e8a13
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
4 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
|
ELF
|
49ea782f7c
|
解决冲突
|
4 years ago |
|
廖金灵
|
9e3de695ca
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
|
4 years ago |
|
廖金灵
|
e4ab39bf64
|
Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
|
4 years ago |
|
zhengyongxing
|
ea2683716f
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
廖金灵
|
54ad7191b1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
|
4 years ago |
|
廖金灵
|
2ea819c585
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
|
4 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
4 years ago |
|
ELF
|
ff47282287
|
修改
|
4 years ago |
|
chenzhi
|
5ef1aa6e22
|
新增防止并发请求数据
|
4 years ago |
|
ELF
|
e0f71b67c5
|
处理
|
4 years ago |
|
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
09629a12a8
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
陈志
|
d5c54234b3
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
e3022cb6c2
|
关闭测试验证码
|
4 years ago |
|
ELF
|
6f8b93a26b
|
修改
|
4 years ago |
|
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
|
4 years ago |
|
zhengyongxing
|
91178308f9
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
陈志
|
e01c7e4e01
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
69615c1459
|
优化脚本执行
|
4 years ago |
|
chenzhi
|
0e8730b810
|
优化重算需重新确认
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
chenzhi
|
fb9deff8b7
|
优化新增生效的默认时间
|
4 years ago |
|
chenzhi
|
0f023bed36
|
优化结算提示
|
4 years ago |
|
ELF
|
fbe8d7a351
|
修改bug
|
4 years ago |
|
chenzhi
|
e2bd47ac2d
|
优化按钮太挤
|
4 years ago |
|
chenzhi
|
fe1853065a
|
优化结算原包名显示
|
4 years ago |
|
chenzhi
|
b9604c162a
|
优化操作时间判断
|
4 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
4 years ago |
|
chenzhi
|
f4be3972b2
|
优化结算单确认
|
4 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
4 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
4 years ago |
|
chenzhi
|
47b54d336c
|
优化汇总撤回
|
4 years ago |
|
chenzhi
|
4d65542338
|
优化结算包名文字
|
4 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
4 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
4 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
4 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
4 years ago |
|
chenzhi
|
3ef8061e3e
|
优化个人0值重算
|
4 years ago |
|
chenzhi
|
6b9358c651
|
优化结算
|
4 years ago |
|
chenzhi
|
3cbc769bce
|
优化个人结算
|
4 years ago |
|
chenzhi
|
f70d8cb8a7
|
优化个人结算
|
4 years ago |
|
chenzhi
|
7f01c3ff39
|
优化上游结算方式
|
4 years ago |
|
chenzhi
|
f91b2a5dce
|
优化下游结算
|
4 years ago |
|
chenzhi
|
d946a4c91c
|
优化下游公司结算
|
4 years ago |