From af1829c124116fbe9c59d3b911175a998f869191 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 15:08:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementSetController.class.php | 87 ++++++++++--------- .../Controller/PaymentController.class.php | 34 ++++++++ Application/Payment/View/Payment/lists.html | 15 +++- .../Payment/View/Payment/paymentInfo.html | 67 ++++++++++++++ Data/update.sql | 2 +- 5 files changed, 163 insertions(+), 42 deletions(-) create mode 100644 Application/Payment/View/Payment/paymentInfo.html diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 8ddba5ba4..0436569b8 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -862,57 +862,64 @@ class CompanyStatementSetController extends Controller { array_multisort($last_names,SORT_DESC,SORT_STRING,$v['statement_info']); } } - if($v['statement_money'] < 300){ - //存未满 - if($lackcompany['pay_amount'] > 0){ - $lask_id = $LackStatement->add($lackcompany); - $countdata['create_lack_ids'][] =$lask_id; - $countdata['lack_statement_money'] +=$lackcompany['statement_money']; - $countdata['lack_platform_amount'] +=$lackcompany['platform_amount']; - } + + if($type == 2 && $v['statement_money'] == 0){ + //补点不存 }else{ - if($v['pay_amount'] > 0){ - //存成功配置单号 - $company =[ - "pool_id"=>0, - "company_id"=>$k, - "company_type"=>2, - "company_name"=>$v['partner'], - "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), - "statement_money"=>$v['statement_money'], - "pay_amount"=>$v['pay_amount'], - "platform_amount"=>$v['platform_amount'], - "fine"=>$v['fine'], - "reward"=>$v['reward'], - "statement_begin_time"=>$begintime, - "statement_end_time"=>$endtime, - "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE), - "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) - ]; - if($v['is_payment'] == 1){ - $company['verify_status'] = 0; - }else{ - $company['verify_status'] = 2; + if($v['statement_money'] < 300){ + //存未满 + if($lackcompany['pay_amount'] > 0){ + $lask_id = $LackStatement->add($lackcompany); + $countdata['create_lack_ids'][] =$lask_id; + $countdata['lack_statement_money'] +=$lackcompany['statement_money']; + $countdata['lack_platform_amount'] +=$lackcompany['platform_amount']; + } + + }else{ + if($v['pay_amount'] > 0){ + //存成功配置单号 + $company =[ + "pool_id"=>0, + "company_id"=>$k, + "company_type"=>2, + "company_name"=>$v['partner'], + "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), + "statement_money"=>$v['statement_money'], + "pay_amount"=>$v['pay_amount'], + "platform_amount"=>$v['platform_amount'], + "fine"=>$v['fine'], + "reward"=>$v['reward'], + "statement_begin_time"=>$begintime, + "statement_end_time"=>$endtime, + "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE), + "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) + ]; + if($v['is_payment'] == 1){ + $company['verify_status'] = 0; + }else{ + $company['verify_status'] = 2; + } + $companyid = $StatementInfo->add($company); + $countdata['info_ids'][] =$companyid; + $countdata['del_lack_ids'] =array_merge($countdata['del_lack_ids'],$del_lack_ids); + $countdata['statement_money'] +=$v['statement_money']; + $countdata['pay_amount'] +=$v['pay_amount']; + $countdata['platform_amount'] +=$v['platform_amount']; + $countdata['fine'] +=$v['fine']; + $countdata['reward'] +=$v['reward']; } - $companyid = $StatementInfo->add($company); - $countdata['info_ids'][] =$companyid; - $countdata['del_lack_ids'] =array_merge($countdata['del_lack_ids'],$del_lack_ids); - $countdata['statement_money'] +=$v['statement_money']; - $countdata['pay_amount'] +=$v['pay_amount']; - $countdata['platform_amount'] +=$v['platform_amount']; - $countdata['fine'] +=$v['fine']; - $countdata['reward'] +=$v['reward']; } } } - $this->savePromotateUserPool($users); - $this->savePromotateUserPool($user); + $this->savePromotateUserPool($users,$type); + $this->savePromotateUserPool($user,$type); } /** * 保存信息汇总信息 */ protected function savePromotateUserPool($data){ if(empty($data['create_lack_ids']) && empty($data['del_lack_ids']) && empty($data['info_ids'])){ return;} + if($data['statement_money'] == 0 && $type ==2){ return;} if($data['statement_money'] == 0){ $data['verify_status'] = 5; $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index d8fbfc593..6dafa8e5b 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -17,6 +17,18 @@ class PaymentController extends BaseController "2"=>"下游个人", "3"=>"上游CP" ]; + public $ALIRSP=[ + "out_biz_no"=>"商户订单号", + "order_id"=>"支付订单号", + "pay_fund_order_id"=>"资金流水号", + "status"=>"转账状态", + "trans_date"=>"订单支付时间", + "msg"=>"支付信息", + "sub_msg"=>"失败描述", + "sub_code"=>"失败码", + "remark"=>"打款备注", + "code"=>"打款状态码" + ]; public function _initialize() { $this->admininfo = session('payment_user');; @@ -480,6 +492,28 @@ class PaymentController extends BaseController } } $this->ajaxReturn(["success"=>"打款成功","data"=>[]]); + } + /** + * 打款详情 + */ + public function paymentInfo() + { + if(!isset($_REQUEST['id'])) $this->error("参数错误"); + $id = $_REQUEST['id']; + $info = M("company_statement_info","tab_")->field("pay_info")->where("id='{$id}'")->find()['pay_info']; + $info = json_decode($info,true); + $senddata = []; + foreach($info as $k => &$v){ + if(isset($this->ALIRSP[$k])){ + $senddata[$this->ALIRSP[$k]] = $v; + }else{ + $senddata[$k] = $v; + } + } + $this->assign("info",$senddata); + $this->display(); + + } protected function setOneVerifyStatus($change_status,$op_pre,$id) { diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html index 690df8279..a15281e7e 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -224,7 +224,7 @@ 查看 - 打款详情 + 打款详情 @@ -310,6 +310,19 @@ content: url }); }); + $(".paymentInfo").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('paymentInfo')}"+"&id="+id + layer.open({ + type: 2, + title: "打款详情", + shadeClose: true, + shade: 0.8, + area: ['20%', '60%'], + content: url + }); + + }) $("#doPayment").on("click",function(){ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { if($(elem).data("pay") == 1){ diff --git a/Application/Payment/View/Payment/paymentInfo.html b/Application/Payment/View/Payment/paymentInfo.html new file mode 100644 index 000000000..26307c007 --- /dev/null +++ b/Application/Payment/View/Payment/paymentInfo.html @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+
+ + + + + + + diff --git a/Data/update.sql b/Data/update.sql index 860db67b1..0245a062d 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1947,7 +1947,7 @@ CREATE TABLE `tab_company_statement_info` ( `pay_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '打款状态 -1:打款失败 0:未打款 1:打款成功', `pay_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '支付完成时间', `pay_type` tinyint(2) NOT NULL DEFAULT '0' COMMENT '打款类型 1提现 2线上打款 3线下打款', - `pay_info` text NOT NULL COMMENT '打款信息', + `pay_info` text COMMENT '打款信息', `remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注', PRIMARY KEY (`id`), From 891f2b6a7f93bd3ea5a64d47c65d0a640eb430f9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 15:54:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Payment/Controller/IndexController.class.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Application/Payment/Controller/IndexController.class.php diff --git a/Application/Payment/Controller/IndexController.class.php b/Application/Payment/Controller/IndexController.class.php new file mode 100644 index 000000000..876436b75 --- /dev/null +++ b/Application/Payment/Controller/IndexController.class.php @@ -0,0 +1,14 @@ + + */ +class IndexController extends BaseController +{ + public function index() + { + $this->redirect('Payment/lists'); + } + +} From 553d9b0f9127afe9e193e0837a1440e588e01c8f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 16:34:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E6=88=90?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 124 +++++- .../Admin/View/CompanyGameRatio/index.html | 135 +------ .../Admin/View/CompanyGameRatio/lists.html | 367 ++++++++++++++++++ 3 files changed, 495 insertions(+), 131 deletions(-) create mode 100644 Application/Admin/View/CompanyGameRatio/lists.html diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 4d325d7ce..e8045a438 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -20,8 +20,96 @@ class CompanyGameRatioController extends AdminController $this->DBModel = M("company_game_ratio","tab_"); parent::_initialize(); } - public function index() + { + $params = I('get.'); + $page = $params['p'] ? intval($params['p']) : 1; + $row = $params['row'] ? intval($params['row']) : 10; + //权限分配 + if(!IS_ROOT){ + $this->OpAuthList= getModuleControllerAuth(); + } + + $gamewhere['_string'] = '1 = 1'; + $where['_string'] = '1 = 1'; + if(isset($params['relation_game_id'])){ + $gamewhere['relation_game_id'] = $params['relation_game_id']; + $where['m.relation_game_id'] = $params['relation_game_id']; + } + if(isset($params['company_id'])){ + $where['m.company_id'] = $params['company_id']; + } + $this->checkListOrCountAuthRestMap($where); + + $gameres = M("game","tab_")->field("tab_game.relation_game_id,tab_game.relation_game_name,IF(tab_game.original_package_name='','未配置',tab_game.original_package_name) original_package_name,tab_game_type.type_name game_type_name")->where($gamewhere)->join("tab_game_type on tab_game.game_type_id = tab_game_type.id")->group("tab_game.relation_game_id")->select(false); + $dbres = M("company_game_ratio","tab_") + ->alias('m') + ->field("m.*,g.*,p.company_name,p.company_belong") + ->join("left JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id") + ->join("left JOIN tab_promote_company p ON m.company_id = p.id") + ->where($where); + if(isset($params['export'])){ + $dbres = $dbres->select(); + }else{ + $dbres = $dbres->page($page, $row)->select(); + } + foreach($dbres as $k=>&$v){ + $v['settlement_type'] ='--'; + $v['begin_time'] = date("Y-m-d",$v['begin_time']); + $v['end_time'] = $v['end_time'] ? date('Y-m-d', $v['end_time']) : '永久'; + + $v["valid"] = "{$v['begin_time']} ~ {$v['end_time']}"; + + $v['company_belong'] ="下游".getCompanyBlong($v['company_belong']); + if (isset($params['export'])) { + $symbol = "\n"; + } else { + $symbol = "
"; + } + //新 + $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : []; + $thisRatioDtl = "默认：{$v['ratio']}%"; + if ($thisTurnoverRatios) { + + foreach ($thisTurnoverRatios as $thisTurnoverRatio) { + $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥'; + $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%"; + } + } + $v['turnover_ratio_str'] = $thisRatioDtl; + $v['oplist'] = $this->OpAuth($v); + } + if(isset($_REQUEST['export'])){ + $GetData = $_GET; + unset($GetData['export']); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]); + + data2csv($dbres,'推广游戏分成管理',array( + "company_name"=>"公司名称", + "company_belong"=>"内外团", + "settlement_type"=>"结算周期", + "game_type_name"=>"游戏类型", + "original_package_name"=>"原游戏名称", + "relation_game_name"=>"现游戏名称", + "valid"=>"生效时间", + "turnover_ratio_str"=>"分成比例" + )); + } + + $count = M("company_game_ratio","tab_")->alias('m')->field("count(id) count")->where($where)->find()['count']; + $this->assign('data', $dbres); + $page = set_pagination($count, $row); + if($page) { + $this->assign('_page', $page); + } + + $this->assign("companyList",D("PromoteCompany")->getList()); + $this->assign("gameList",D("Game")->getRelationGameLits()); + $this->display(); + dd( $dbres); + } + + public function lists() { $params = I('get.'); $page = $params['p'] ? intval($params['p']) : 1; @@ -43,7 +131,7 @@ class CompanyGameRatioController extends AdminController if(isset($params['status'])){ $where['m.status'] = $params['status']; } - //TODO:未计算公司类型,未进行排序 + //TODO:未计算公司类型 $this->checkListOrCountAuthRestMap($where); $gameres = M("game","tab_")->field("tab_game.relation_game_id,tab_game.relation_game_name,IF(tab_game.original_package_name='','未配置',tab_game.original_package_name) original_package_name,tab_game_type.type_name game_type_name")->where($gamewhere)->join("tab_game_type on tab_game.game_type_id = tab_game_type.id")->group("tab_game.relation_game_id")->select(false); $dbres = M("company_game_ratio_log","tab_") @@ -156,6 +244,8 @@ class CompanyGameRatioController extends AdminController $this->assign("gameList",D("Game")->getRelationGameLits()); $this->display(); } + + public function marketAgree(){ if(!isset($_REQUEST['ids'])) $this->error("参数错误"); @@ -369,6 +459,20 @@ class CompanyGameRatioController extends AdminController } $id = $_REQUEST['id']; $res = M("company_game_ratio_log","tab_")->where("id='{$id}'")->delete(); + if($res !== false){ + addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"删除成功","code"=>1,"url"=>U("lists")]); + }else{ + $this->error('删除错误'); + } + } + public function delGameRatio() + { + if(!isset($_REQUEST['id'])){ + $this->error('参数错误'); + } + $id = $_REQUEST['id']; + $res = M("company_game_ratio","tab_")->where("id='{$id}'")->delete(); if($res !== false){ addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除','url'=>U('index')]); $this->ajaxReturn(["msg"=>"删除成功","code"=>1,"url"=>U("index")]); @@ -376,6 +480,7 @@ class CompanyGameRatioController extends AdminController $this->error('删除错误'); } } + public function menuAuth() { $addurl = U("addRatio"); @@ -405,14 +510,19 @@ class CompanyGameRatioController extends AdminController $opBtn = [ "editRatio"=>"编辑", "delRatio"=>"删除", + "delGameRatio"=>"删除", ]; //操作对应菜单 - - if($info['status'] == 2){ - $optist = []; + if(!isset($info['status'])){ + $optist = ["delGameRatio"]; }else{ - $optist = ["editRatio","delRatio"]; + if($info['status'] == 2){ + $optist = []; + }else{ + $optist = ["editRatio","delRatio"]; + } } + // $resarr = []; foreach ($optist as $k => $v) { @@ -427,6 +537,8 @@ class CompanyGameRatioController extends AdminController return $resarr; } + + public function setTurnoverRatio($params) { $save['turnover_ratio'] = []; diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index e65d04238..8fe2cfa50 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -52,8 +52,12 @@
-

推广游戏分成管理

-

+
+ 生效列表 + 审核列表 +
+

推广游戏分成

+

未进行公司绑定的公司结算单将无法进行审核及打款

+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ 搜索 +
+
+ +
+
+
+ + {$vo} + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 公司名称内外团结算周期游戏类型原游戏名称现游戏名称生效时间原比例申请比例创建记录市场部审批管理员审批备注操作
aOh! 暂时还没有内容!
+ + {$data.company_name}{$data.company_belong}{$data.settlement_type}{$data.game_type_name}{$data.original_package_name}{$data.relation_game_name}{$data.valid} +
+ {$data.last_turnover_ratio_str} +
+ 		+
+ {$data.turnover_ratio_str} +
+ 		+
+ {$data.create} +
+ 		+ + +
+ {$data.market} +
+ +
+ {$data.market} +
+ + 		+ +
+ {$data.admin} +
+ +
+ {$data.admin} +
+ + 		+ {$data.remark} + + + {$vo} + +
+
+ +
+ +
+ + 导出 + + {$_page|default=''} +
+ +
+
+
    +
  1. +
    + 备注: + +
    +
    拒绝
     +
    2. +
+
+
+ + + + + + + From d5aeb21b33227e915bac8d654e85b468ec8ab5b4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 16:50:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 18 ++++++++++++++---- .../Admin/View/CompanyGameRatio/index.html | 8 +------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index e8045a438..c47a0ef63 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -44,9 +44,10 @@ class CompanyGameRatioController extends AdminController $gameres = M("game","tab_")->field("tab_game.relation_game_id,tab_game.relation_game_name,IF(tab_game.original_package_name='','未配置',tab_game.original_package_name) original_package_name,tab_game_type.type_name game_type_name")->where($gamewhere)->join("tab_game_type on tab_game.game_type_id = tab_game_type.id")->group("tab_game.relation_game_id")->select(false); $dbres = M("company_game_ratio","tab_") ->alias('m') - ->field("m.*,g.*,p.company_name,p.company_belong") + ->field("m.*,g.*,p.company_name,p.company_belong,IFNULL(r.settlement_type,0) settlement_type") ->join("left JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id") ->join("left JOIN tab_promote_company p ON m.company_id = p.id") + ->join("left JOIN tab_company_relation r ON (r.first_company_type =2 AND r.first_company_id = m.company_id) OR (r.second_company_type =2 AND r.second_company_id = m.company_id)") ->where($where); if(isset($params['export'])){ $dbres = $dbres->select(); @@ -54,7 +55,6 @@ class CompanyGameRatioController extends AdminController $dbres = $dbres->page($page, $row)->select(); } foreach($dbres as $k=>&$v){ - $v['settlement_type'] ='--'; $v['begin_time'] = date("Y-m-d",$v['begin_time']); $v['end_time'] = $v['end_time'] ? date('Y-m-d', $v['end_time']) : '永久'; @@ -66,6 +66,11 @@ class CompanyGameRatioController extends AdminController } else { $symbol = "
"; } + if($v['settlement_type'] == 0){ + $v['settlement_type'] = '--'; + }else{ + $v['settlement_type'] = $v['settlement_type']== 1 ? "周结" : '月结'; + } //新 $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : []; $thisRatioDtl = "默认：{$v['ratio']}%"; @@ -136,9 +141,10 @@ class CompanyGameRatioController extends AdminController $gameres = M("game","tab_")->field("tab_game.relation_game_id,tab_game.relation_game_name,IF(tab_game.original_package_name='','未配置',tab_game.original_package_name) original_package_name,tab_game_type.type_name game_type_name")->where($gamewhere)->join("tab_game_type on tab_game.game_type_id = tab_game_type.id")->group("tab_game.relation_game_id")->select(false); $dbres = M("company_game_ratio_log","tab_") ->alias('m') - ->field("m.*,g.*,p.company_name,p.company_belong") + ->field("m.*,g.*,p.company_name,p.company_belong,IFNULL(r.settlement_type,0) settlement_type") ->join("left JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id") ->join("left JOIN tab_promote_company p ON m.company_id = p.id") + ->join("left JOIN tab_company_relation r ON (r.first_company_type =2 AND r.first_company_id = m.company_id) OR (r.second_company_type =2 AND r.second_company_id = m.company_id)") ->where($where) ->order("FIELD(m.status,0,1,-1,-2,2),id desc"); if(isset($params['export'])){ @@ -147,7 +153,11 @@ class CompanyGameRatioController extends AdminController $dbres = $dbres->page($page, $row)->select(); } foreach($dbres as $k=>&$v){ - $v['settlement_type'] ='--'; + if($v['settlement_type'] == 0){ + $v['settlement_type'] = '--'; + }else{ + $v['settlement_type'] = $v['settlement_type']== 1 ? "周结" : '月结'; + } $v['begin_time'] = date("Y-m-d",$v['begin_time']); $v['end_time'] = $v['end_time'] ? date('Y-m-d', $v['end_time']) : '永久'; diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index 8fe2cfa50..f6ca428d8 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -108,9 +108,6 @@ - - - 公司名称 内外团 结算周期 @@ -127,14 +124,11 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! - - - {$data.company_name} {$data.company_belong} {$data.settlement_type} From fb0edbe752ab047e1d2c298823579799078d7aa3 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 17:36:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyGameRatio/index.html | 2 +- Application/Admin/View/CompanyGameRatio/lists.html | 2 +- Application/Payment/Controller/PaymentController.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index f6ca428d8..2633ac58a 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -57,7 +57,7 @@ 审核列表

推广游戏分成

-

未进行公司绑定的公司结算单将无法进行审核及打款

+

删除后游戏比例将读取模板值