 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 |
|
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
|
6e49bcc353
|
优化财务汇总
|
4 years ago |
|
chenzhi
|
8b82fff791
|
优化任务插入
|
4 years ago |
|
chenzhi
|
62b566e8b8
|
优化地址填写
|
4 years ago |
|
ELF
|
2867a05bb3
|
修改
|
4 years ago |
|
chenzhi
|
f0e43df7c2
|
新增重算
|
4 years ago |
|
chenzhi
|
fb75494c64
|
新增系统执行命令方法
|
4 years ago |
|
ELF
|
0923006a20
|
修改
|
4 years ago |
|
ELF
|
3890410bec
|
优化
|
4 years ago |
|
廖金灵
|
90bb38cd56
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改BUG
|
4 years ago |
|
ELF
|
b1f4ec2d9a
|
修改
|
4 years ago |
|
廖金灵
|
747dc7394c
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
404da03cd0
|
修改
|
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 |
|
廖金灵
|
8ae08a6784
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限
|
4 years ago |
|
ELF
|
2a52df9ebb
|
测试资源权限
|
4 years ago |
|
廖金灵
|
79af51d27b
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
|
4 years ago |
|
ELF
|
e249596014
|
修改
|
4 years ago |
|
chenzhi
|
f5ad1a6d0c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
9f06436207
|
优化转换注释
|
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 |
|
ELF
|
c2da9641f0
|
优化
|
4 years ago |
|
zhengyongxing
|
250d2ac2c0
|
市场业绩毛利修改
|
4 years ago |
|
ELF
|
06c4d5f1f1
|
优化测试资源
|
4 years ago |
|
ELF
|
247c4e9aae
|
ss
|
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
|
f91db42a57
|
优化下游导出2
|
4 years ago |
|
chenzhi
|
901198f546
|
优化下游个人信息
|
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
|
d30ef409fc
|
优化
|
4 years ago |
|
ELF
|
c9cd377d4f
|
修改
|
4 years ago |
|
ELF
|
fa9d330603
|
修改
|
4 years ago |
|
ELF
|
367345ea8d
|
修改
|
4 years ago |
|
elf@home
|
461f347b1a
|
修改
|
4 years ago |
|
ELF
|
ecf460e7c9
|
修改
|
4 years ago |
|
廖金灵
|
db4fc9699c
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
|
4 years ago |
|
chenzhi
|
7eee79a867
|
优化导出
|
4 years ago |
|
ELF
|
9c59ba06e2
|
修改
|
4 years ago |
|
zhengyongxing
|
62f4ce3362
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
d63edee6b3
|
优化结算单界面信息
|
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 |
|
ELF
|
c0fe59864c
|
修改
|
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 |
|
廖金灵
|
a2ab4a6680
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修正
|
4 years ago |
|
zhengyongxing
|
ccca696de2
|
市场结算管理bug修正
|
4 years ago |
|
zhengyongxing
|
a140a4c9d5
|
市场结算管理bug修正
|
4 years ago |
|
ELF
|
49751b8760
|
测试资源修改
|
4 years ago |
|
廖金灵
|
a2154936f7
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化重算
|
4 years ago |
chenzhi
|
88a129f06c
|
优化重算
|
4 years ago |
|
廖金灵
|
730dd059d8
|
Merge branch 'hotfix/landing_page' of wmtx/platform into master
落地页优化
|
4 years ago |
|
廖金灵
|
8711b85d1e
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修正
|
4 years ago |
|
chenzhi
|
5db1f7ce24
|
优化比例显示
|
4 years ago |
|
zhengyongxing
|
bd9af09830
|
市场结算管理bug修正
|
4 years ago |
|
chenzhi
|
4143a67238
|
优化下游个人导出
|
4 years ago |
|
chenzhi
|
9ee69f9bd4
|
优化下游结算单导出
|
4 years ago |
|
chenzhi
|
82787ca561
|
优化上游结算单导出模板样式
|
4 years ago |
|
chenzhi
|
07fd53a6aa
|
优化上游导出文件格式及时间问题
|
4 years ago |
|
chenzhi
|
7ba9c25610
|
优化上游导出%
|
4 years ago |
|
zhengyongxing
|
c72d60b37d
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
|
4 years ago |
|
廖金灵
|
c53abd3114
|
Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
|
4 years ago |
|
chenzhi
|
372958f45d
|
优化添加关系的开票内容
|
4 years ago |
|
zyx
|
223c69797c
|
平台币导出bug修正
|
4 years ago |
|
廖金灵
|
6c8699dc1e
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
|
4 years ago |
|
zyx
|
8c0646d2a0
|
平台币导出bug修正
|
4 years ago |
|
廖金灵
|
0665e8265a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
|
4 years ago |
|
zyx
|
5dcc25f97e
|
市场结算管理bug修正
|
4 years ago |
yulingwei
|
ba91c60d5d
|
upt
|
4 years ago |
|
yulingwei
|
8d1415258f
|
upt
|
4 years ago |
|
chenzhi
|
4a900587a6
|
优化财务打款备注
|
4 years ago |
|
chenzhi
|
1ac4c280ad
|
优化其他导出
|
4 years ago |
|
chenzhi
|
54239b1f54
|
优化导出
|
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 |
|
zhengyongxing
|
22961561d4
|
充值订单充值状态增加
|
4 years ago |
|
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 |