Commit Graph

3229 Commits (747dc7394c30d89ca21072cef7804e4ba61e1207)

Author SHA1 Message Date
zhengyongxing c72d60b37d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
廖金灵 c53abd3114 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
chenzhi 372958f45d 优化添加关系的开票内容
zyx 223c69797c 平台币导出bug修正
廖金灵 6c8699dc1e Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
zyx 8c0646d2a0 平台币导出bug修正
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
zyx 5dcc25f97e 市场结算管理bug修正
chenzhi 1ac4c280ad 优化其他导出
chenzhi 54239b1f54 优化导出
chenzhi b2239380bf 优化负数结算规则
chenzhi 978a42b4df 优化结算流水判定依旧平台流水
chenzhi 7335f5da15 上下游非0都要结算
chenzhi ecf92c03a7 合并
chenzhi 9b61a39620 优化游戏统计导出时间问题
chenzhi ba20c3683a 优化游戏统计时间
陈志 97f79a9c0f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into release
chenzhi 4c1a03b7c7 优化结算流水及汇总金额300判定
廖金灵 194523f00f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游cp结算比例问题
chenzhi ca7f92573b 优化上游cp结算比例问题
廖金灵 a45b12ed3f Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 672b276228 修改bug
廖金灵 6145745a01 Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改游戏统计
ELF b71c81d764 修改bug
廖金灵 49365c790d Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化上游比例获取
chenzhi 9d9eae85ec 优化上游比例获取
zhengyongxing 22961561d4 充值订单充值状态增加
chenzhi 47e57f48e6 优化审批文字错误
廖金灵 7d676b406f Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游查看
chenzhi c57c40535b 优化下游查看
廖金灵 5855973c67 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化下游结算为支付时间
chenzhi 651aa6cc8b 优化参数不足
chenzhi 071c8c78f4 优化下游结算为新增时间
廖金灵 a36123059c Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化聚合渠道统计
chenzhi 884f919387 优化聚合渠道统计
廖金灵 a05770557b Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化汇总时间显示
chenzhi 0fd5bc7fe8 优化汇总时间显示
chenzhi b9567f6faf 优化时间戳模式
chenzhi 724fe9e60f 优化导出市场专员
廖金灵 54f933aba1 Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 95672ffc90 修改bug
廖金灵 637f22c22b Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 8e40b43696 修改bug
ELF 83a1d34b2c 修改bug
廖金灵 3d36fbb00d Merge branch 'hotfix/agg_data' of wmtx/platform into master
修改bug
ELF 7445125745 修改bug
廖金灵 edae05c50e Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化结算
chenzhi f3b145f930 优化未结算查询
chenzhi f7581f3504 优化结算小于0依旧结算
ELF 6ac8a0a9b3 修改bug
ELF 0ee5ea3c02 修改bug
chenzhi a90149b31b 隐藏会长结算方式
chenzhi 12f232219c 优化下游个人查看
chenzhi 71d0d2c9d1 优化个人显示支付方式
ELF 7471dcf338 取消调试代码
ELF e34d28e2c8 修改
chenzhi 52345e4eb1 优化导出新增支付宝信息
chenzhi 3fc9b578a9 优化个人重算
chenzhi 007ca52afa 优化个人比例获取方式
chenzhi 9b32f0cd0e 优化获取cp比例
廖金灵 406d1c47d4 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
zyx 9df721d1f5 平台币导出bug修正
廖金灵 8c942dbcbc Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
zyx 3c8f637240 平台币导出增加商户
zyx bbb7f3301c 平台币导出增加商户
zyx 896cdd92b9 平台币增加商户
廖金灵 20a2184521 Merge branch 'hotfix/platform_statistic_search' of wmtx/platform into master
统计搜索优化
yulingwei 8d36e35271 upt
廖金灵 1440856626 Merge branch 'hotfix/add_prompte_relation' of wmtx/platform into master
优化新增会长关系不跟随
chenzhi 5f1afdef9f 优化新增会长关系不跟随
廖金灵 0e878884bb Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场业绩bug修改,权限添加
zhengyongxing 1bea859fd4 市场业绩bug修改,权限添加
yulingwei 9cdab21db9 repair search
廖金灵 79b0f3224d Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改权限控制
ELF cbd3bc7362 修改
廖金灵 32bdbbfc39 Merge branch 'hotfix/session_and_bug' of wmtx/platform into release
修改session过期时间
ELF 81a706e809 修改session过期时间
陈志 890499ce59 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi 52419ae22a 优化上游不结算金额
chenzhi 4a44604047 优化渠道汇总
chenzhi b73e3fea84 优化财务汇总统计
chenzhi 0c11ddb004 优化聚合数据
chenzhi 98c8c7ee1e 优化测试服订单
郑永星 c55b798bb4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 1f6c96e3a9 bug修改
zhengyongxing 05d3ba9c23 财务汇总统计bug修改
zhengyongxing e67538fcef 财务汇总统计bug修改汇总统计修改
zhengyongxing c6570fee01 财务汇总统计bug修改汇总统计修改
zhengyongxing 38da7f005d 汇总统计修改
chenzhi 13efc01d3d 优化财务汇总
chenzhi f0d20598de 新增商户权限
chenzhi ef4702fb46 暂存
郑永星 fe4a029ce4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 1372b5b15d Merge remote-tracking branch 'origin/hotfix/market_percentage' into hotfix/market_percentage
zhengyongxing 7aa031bbb4 市场结算管理优化
chenzhi 3b3ed208e2 财务汇总新增测试订单收入
chenzhi 837c09716d 财务汇总-支付时间
廖金灵 37a84b8ce7 Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
zhengyongxing f9503182da 市场结算管理优化
廖金灵 613b50eb63 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加