elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,411 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

3662 Commits (39f6dd7011ebd67ddc576fc0a1532b335751a055)

Author SHA1 Message Date
ELF 82bc905b45 返利优化
ELF 79872573b9 优化
ELF ba3d1dadd2 优化
ELF 525c3012b2 yhg
廖金灵 881b9f91f8 Merge pull request '优化下游结算' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/444
chenzhi e39e02d970 优化下游结算
廖金灵 1d8e6984c8 Merge pull request 'feature/market_department_search' () from feature/market_department_search into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/443
ELF d8357c072e 优化
ELF b231f1a50f 优化
chenzhi eb2db36c6b 优化特殊补点市场员查看
chenzhi 3b97aab1ed 优化绩效
chenzhi 4307c6afa8 优化允许绩效为0
ELF 82a70f0e05 优化
chenzhi bc19bec4b1 优化发放
chenzhi 83822e7952 定时任务删除
chenzhi 089390376c 优化周一定时器
ELF 1912e2b203 搜索
chenzhi 5224094042 优化充值查看
chenzhi 5bef7fb351 优化支付商户配置查看
chenzhi 41f2234108 优化充值查看
chenzhi 34d07e1578 优化支付查看
ELF 55a14f9d46 优化玩家迁移
chenzhi 4f5fe04178 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 7b80101707 优化初始
chenzhi a9400d3c0b 优化订单显示
chenzhi 7d3dc9f8d2 优化公会押金权限
chenzhi 822894ea17 优化公会查看
chenzhi 5ccda517b3 优化公司查看
chenzhi acaf3ec370 优化公会信息权限
chenzhi e523dc7e88 游戏比例模板权限区分
chenzhi 22619dff0c 优化游戏比例申请
chenzhi 2ddb07426a 优化取消部门领导
chenzhi 3d215d57aa 优化会长添加或者换绑引起的市场变化
chenzhi 39dcf64803 优化下游打款统计
chenzhi 29e03a1718 优化市场部提成
chenzhi f66b7088e3 优化
chenzhi b679708156 优化市场业绩脚本
chenzhi 8ebecb5517 优化市场绩效脚本
chenzhi 5439bd2ee0 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
廖金灵 2c10246a4f Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/418
廖金灵 0d0ea4259a Merge pull request 'feature/game_rebate' () from feature/game_rebate into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/420
ELF b94a463d24 优化
chenzhi 4b28077e12 新增市场部部门显示
ELF 69922e73a1 有害
chenzhi c89d1540e7 新增初始化数据
chenzhi b1ee5b0f4f 优化市场部毛利按实际换绑时间计算
廖金灵 2065d8c353 Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/415
chenzhi f5f20300c7 新增离职后无需确认绩效
chenzhi 5fbe327cba 新增备注
chenzhi c549cc703e 新增线下打款导出
chenzhi 4efab5c479 新增定时任务查看
chenzhi df3b3ad4f8 优化编辑
chenzhi 65be8ad894 优化毛利数据
chenzhi 7993af7973 设定重算时间
chenzhi 85f7977d1a 新增月结每周一脚本
chenzhi e61df7adc4 优化经理绩效统计
chenzhi 8c2f4f7edd 聚合代码关服更新
chenzhi 50b491d490 优化确认查询
chenzhi 2bbacb15a5 新增重算按钮提示
chenzhi 52e7f3059f 新增经理计算
chenzhi 9789da2aab 优化排序
chenzhi f8afea93f3 优化排序
chenzhi fb56f1ebe7 新增市场经理
chenzhi 0f38a464ce 优化流水0显示
ELF 95fea8fcf6 優化到處
ELF faf2fdc41f 优化
ELF 0ea585bd96 游戏返利
chenzhi 3de4aa185a 新增市场经理
廖金灵 05dd251fec Merge pull request '新增判断结算包名' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/407
chenzhi 91585e6ed4 新增判断结算包名
廖金灵 8b14d3c3b0 Merge pull request '优化毛利计算' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/406
chenzhi c5c2f7fee3 优化毛利计算
廖金灵 81db2f512f Merge pull request 'release' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/405
chenzhi a982732fdd Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 90b2cb4d9b 优化市场毛利
张谷成 56a73931ea Merge pull request '公会信息默认沟通时间降序' () from feature/wx_share into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/403
tping aea9d193e7 公会信息默认沟通时间降序
chenzhi 3a905fcf59 优化数据生成
chenzhi 4ff9f76a5c 优化毛利统计
chenzhi 5ce952ef1e 优化原包名获取
chenzhi 5ee21eb781 暂存
廖金灵 50a0eab2f6 Merge pull request '商务汇总' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/400
张谷成 5598437dce Merge pull request 'feature/wx_share' () from feature/wx_share into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/399
tping d8b2a161af 权限
tping badb3bca31 设置权限、admin、市场总监可以看所有数据
ELF d1aff92c99 下载bug
ELF 546abbfa72 添加奖金池总额
ELF 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package
ELF 1279cbfe3b 优化
chenzhi 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 1263383533 优化内团毛利计算公式
廖金灵 91701f3ecc Merge pull request '修复汇总导出' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
chenzhi d6ea8057f0 修复汇总导出
廖金灵 82a40a79bd Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/388
廖金灵 84a6b21f88 Merge pull request '优化' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
ELF 9fb91c4a66 优化
chenzhi 626c63fe89 取消汇总不结算信息
chenzhi 497d3f8f61 优化计算及导出
chenzhi db28185af3 优化毛利统计方式
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi d60330a093 新增商户支付导出
chenzhi 31fa1fcfc2 上游cp新增是否过期查询
chenzhi 24e4f77a98 毛利现在bug打印
chenzhi 4d8e7de144 新增打款确认优化
chenzhi 2d1da379b0 新增生效配置
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 648fb3ebbf 优化内部公司改进
chenzhi 4b1935676b 新增内外团查询
chenzhi e274f863a8 新增内部公司部门查询
廖金灵 a0a1c5635e Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/378
ELF d6efc36e9a 优化
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi c4849ffc7c 新增商户固定
廖金灵 f568c40e22 Merge pull request '金额错误bug修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/363
zhengyongxing b1c82bfd69 金额错误bug修改
zhengyongxing b58bdab705 金额错误bug修改
廖金灵 9e44ad5fe3 Merge pull request '5.27新功能时间修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/362
zhengyongxing a4bf7ff108 5.27新功能时间修改
廖金灵 cd33286900 Merge pull request '优化导出错误' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/361
chenzhi ad49a9a419 优化导出错误
廖金灵 f5e42522bf Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/359
chenzhi f211fe6fa7 优化批量导出
廖金灵 bba10a23b1 Merge pull request '5.27新功能上线' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/358
zhengyongxing 8abf4e4eb8 5.27新功能上线
chenzhi 3b725f9c1d 新增汇总查看
chenzhi db0d49fe4b 优化合并查看
廖金灵 f556d7889e Merge pull request '修改' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/357
郑永星 6b10bc1b05 Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/355
zhengyongxing 0c5dfdebf9 5.26功能上线
chenzhi e95087060a 优化上游逻辑
chenzhi 6df1f871f2 优化设置后的其他比例问题
陈志 a0c9d6e7a9 Merge pull request 'hotfix/change_pay_0526' () from hotfix/change_pay_0526 into release 
优化名称
郑永星 24728cf1ec Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/352
zhengyongxing e710d5a710 5.26功能上线
chenzhi 7f9d2e3c97 优化类大小写
陈志 a187b17cdd Merge pull request 'feature/more_payment' () from feature/more_payment into release 
优化上游比例
chenzhi 7aa29e8f3f 优化每月计算及导出
chenzhi 1728886f1f 优化上游比例
chenzhi 06f5882107 格式化数据
zhengyongxing 123ee98c59 5.26功能上线
zhengyongxing 5aeff6e3f2 5.26功能上线
zhengyongxing 7265ddd23e 5.26功能上线
chenzhi 9631a26d40 优化结算
郑永星 fcf3e09c1b Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/344
zhengyongxing 4f0bad5c45 5.26功能上线
chenzhi fd285df021 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 2ac55db936 优化导出名称
chenzhi 3dca998277 优化权限
chenzhi 78b85d9b37 新增导出
chenzhi 365faa99a7 新增重算功能