diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index cb3a928d2..ac263b2db 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -24,7 +24,7 @@ class MarketPercentageController extends ThinkController ->field("pay_time,promote_account,company_belong,member.real_name,develop_type,game_name, sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount, sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit") - ->join("left join sys_member member on access.uid=admin_id"); + ->join("left join sys_member member on member.uid=admin_id"); if ($_REQUEST['export']) { $data = $data->where($map) @@ -220,14 +220,14 @@ class MarketPercentageController extends ThinkController $map = []; -// $map['group_id'] = ['in','11,12,21']; + $map['group_id'] = ['in','11,12,21']; $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):''; $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):''; $_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):''; $admin_id = $_SESSION['onethink_admin']['user_auth']['uid']; -// $map['admin_id'] = $admin_id; + $map['admin_id'] = $admin_id; $data = M("settleup_marketorder","tab_") ->field("tab_settleup_marketorder.id,pay_time,promote_account,company_belong,member.real_name,develop_type,game_name, @@ -426,6 +426,20 @@ class MarketPercentageController extends ThinkController } + public function reCaculateBonus() { + + $pay_time = $_REQUEST['pay_time']; + + if (!$pay_time) { +// $pay_time = "all"; + $pay_time = date("Y-m",strtotime('-1 month')); + } + + exec("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &"); + + $this->success('操作成功,后台正在计算中，请稍后再打开......'); + } + public function showBonusList($row = 10, $p = 1) { $map = []; @@ -480,4 +494,49 @@ class MarketPercentageController extends ThinkController } + public function editTaxRatio() { + + if (IS_POST) { + + if (!$_POST['tax_radio']) { + $this->error("税率不能填空"); + } + + if (!$_POST['timestart']) { + $this->error("生效时间不能填空"); + } + + $data = $_POST; + $data['timestart'] = strtotime($data['timestart']); + + $data = json_encode($data); + + $is_save = M("tool","tab_") + ->where(['name'=>'tax_radio']) + ->save(['config'=>$data]); + + if ($is_save) { + $this->success("保存成功",U("index")); + } else { + $this->error("保存失败"); + } + + } else { + + $data = M("tool","tab_") + ->field("config") + ->where(['name'=>'tax_radio'])->find(); + + $data['config'] = json_decode($data['config'],true); + + $data['config']['timestart'] = date("Y-m-d",$data['config']['timestart']); +// var_dump($data['config']);die(); + + $this->assign('data',$data['config']); + $this->display(); + + } + + } + } diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index e41992943..2b17f82f1 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -456,6 +456,16 @@ class TimingController extends AdminController { ->select(); // dump($promote_data);die(); + $tax_radio = 0; + $data = M("tool","tab_") + ->field("config") + ->where(['name'=>'tax_radio'])->find(); + + $data = json_decode($data['config'],true); + if (time() >= $data['timestart']) { + $tax_radio = $data['tax_radio']; + } + foreach ($promote_data as $key => $value) { $cp_radio = getGameCpRadio($value['game_id'],$value['pay_amount'],true); @@ -474,7 +484,7 @@ class TimingController extends AdminController { //渠道费用 $promote_data[$key]['channel_amount'] = $channel_fee[$value['pay_time'].$value['promote_id'].$value['game_name'].$value['sdk_version']]; //公司税费 - $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*(6.72/100); + $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*($tax_radio/100); //毛利 $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax']; diff --git a/Application/Admin/View/MarketPercentage/edittaxratio.html b/Application/Admin/View/MarketPercentage/edittaxratio.html new file mode 100644 index 000000000..7198806d7 --- /dev/null +++ b/Application/Admin/View/MarketPercentage/edittaxratio.html @@ -0,0 +1,117 @@ + + + + + + + + + + + +
+

公司税率修改

+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + +
原税率： + {$data['tax_radio']}% + 修改后税率： + +
生效时间点： + +
+ +
+ + + 返回 + +
+
+
+
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + diff --git a/Application/Admin/View/MarketPercentage/index.html b/Application/Admin/View/MarketPercentage/index.html index 69aca9cbf..f493a4cbf 100644 --- a/Application/Admin/View/MarketPercentage/index.html +++ b/Application/Admin/View/MarketPercentage/index.html @@ -42,7 +42,7 @@
- 新增 + 重算
@@ -107,7 +107,7 @@ 上游结算流水 下游结算流水 支付渠道费用 - 公司税费 + 公司税费 税后毛利额 @@ -284,6 +284,32 @@ }); }) + + $('.recaculate').click(function(){ + var url = $(this).attr('url'); + layer.confirm('是否确认重算提成！', { + title:'重算提成?', + icon:0, + btn: ['重算','取消'] //按钮 + }, function(){ + $.ajax({ + type: "POST", + url: url, + dataType: 'json', + async: false, + success:function(data){ + layer.msg("重新计算需要时间,请等待5分钟后再查看"); + setTimeout(function(){ + window.location.reload(); + },1500); + }, + }); + }, function(){ + layer.close(); + }); + + }); + }) diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index e50051110..4b0da8334 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -42,7 +42,7 @@
- 新增 + 重算
@@ -260,6 +260,32 @@ }); }) + + $('.recaculate').click(function(){ + var url = $(this).attr('url'); + layer.confirm('是否确认重算提成！', { + title:'重算提成?', + icon:0, + btn: ['重算','取消'] //按钮 + }, function(){ + $.ajax({ + type: "POST", + url: url, + dataType: 'json', + async: false, + success:function(data){ + layer.msg("重新计算需要时间,请等待5分钟后再查看"); + setTimeout(function(){ + window.location.reload(); + },1500); + }, + }); + }, function(){ + layer.close(); + }); + + }); + }) diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html index 46e5a5b1f..c59514822 100644 --- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html @@ -41,7 +41,7 @@
- 新增 + 重算
@@ -275,6 +275,32 @@ }); }) + + $('.recaculate').click(function(){ + var url = $(this).attr('url'); + layer.confirm('是否确认重算提成！', { + title:'重算提成?', + icon:0, + btn: ['重算','取消'] //按钮 + }, function(){ + $.ajax({ + type: "POST", + url: url, + dataType: 'json', + async: false, + success:function(data){ + layer.msg("重新计算需要时间,请等待5分钟后再查看"); + setTimeout(function(){ + window.location.reload(); + },1500); + }, + }); + }, function(){ + layer.close(); + }); + + }); + }) diff --git a/Data/update.sql b/Data/update.sql index a4cb8a5b4..44ffdc984 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1790,4 +1790,6 @@ CREATE TABLE `tab_market_altogether` ( `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT '' COMMENT '备注', `create_time` int(11) NULL DEFAULT 0 COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic; \ No newline at end of file +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic; + +INSERT INTO `tab_tool`(`id`, `name`, `title`, `config`, `type`, `status`) VALUES (59, 'tax_radio', '公司税费', '{"tax_radio":1.5,"time":1589361782}', 1, 1) \ No newline at end of file