From af1829c124116fbe9c59d3b911175a998f869191 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 15:08:50 +0800 Subject: [PATCH 01/27] =?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 02/27] =?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 03/27] =?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 04/27] =?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 05/27] =?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 @@ 审核列表

推广游戏分成

-

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

+

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

 {$_page|default=''} @@ -265,24 +265,34 @@ } $(function(){ - + var loop = 1; var company_id = "{$_GET['company_id']??0}"; $("#company_type").on("change",function(){ var type = $(this).find("option:selected").val(); - var url = "{:U('Ajax/getCompanyList')}"+"&company_type="+type; - $.get(url,function(data){ - var company = data; - var companystr = ''; - for (var i in company) { - if(company[i].id == company_id){ - companystr += "" - }else{ - companystr += "" + if(type != ''){ + var url = "{:U('Ajax/getCompanyList')}"+"&company_type="+type; + $.get(url,function(data){ + var company = data; + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id && loop==1){ + companystr += "" + }else{ + companystr += "" + } } - } + $("#company_id").html(companystr); + $("#company_id").select2(); + loop++; + }) + }else{ + var companystr = ''; $("#company_id").html(companystr); $("#company_id").select2(); - }) + } + + + }) $("#company_type").change(); From 31ef129b2d4ae1ccbc4e3355f00e3ea88718aa09 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 18:21:55 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B1=E6=96=B9?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 1 - Application/Admin/View/Tool/company_info.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 401824cba..9f997e287 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -919,7 +919,6 @@ class ToolController extends ThinkController { $this->error('参数异常'); } } - $res = M('company_info', 'tab_')->delete($id); if ($res === false) { $this->error('删除失败'); diff --git a/Application/Admin/View/Tool/company_info.html b/Application/Admin/View/Tool/company_info.html index d8a5f39d0..2f16e6b1b 100644 --- a/Application/Admin/View/Tool/company_info.html +++ b/Application/Admin/View/Tool/company_info.html @@ -39,7 +39,7 @@
新增 - 删除 + 删除
From b28231d12fa90269b8b88245d3eee7902d6017e0 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 18:25:51 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=B1=E6=96=B9?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Tool/company_add.html | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Application/Admin/View/Tool/company_add.html b/Application/Admin/View/Tool/company_add.html index 96d71f20f..4a4f2832c 100644 --- a/Application/Admin/View/Tool/company_add.html +++ b/Application/Admin/View/Tool/company_add.html @@ -107,22 +107,13 @@ - + 返回 -
- -
- - -
- 已添加添加至常用设置 -
- From 0312c1bc759125320d1a2d49424ec2b9fc6964c5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 18:27:41 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=B8=E8=A7=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyGameRatio/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyGameRatio/lists.html b/Application/Admin/View/CompanyGameRatio/lists.html index 3823081d4..3aa06cbf2 100644 --- a/Application/Admin/View/CompanyGameRatio/lists.html +++ b/Application/Admin/View/CompanyGameRatio/lists.html @@ -97,7 +97,7 @@
- 搜索 + 搜索
From 701c421d0c11368569795e0899aa854464e72933 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 10:14:08 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 0436569b8..f305f59a7 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -365,6 +365,7 @@ class CompanyStatementSetController extends Controller { //获取支付记录 $paywhere = [ "pay_status"=>1, + "pay_game_status"=>1, "payed_time"=>["BETWEEN",[$begintime,$endtime]], "game_id"=>["in",$gmstr] ]; From ffb60d80a9331329b4cac706ee1f6862c7b5e1f9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:03:17 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=AE=B6?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=88=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 12461b49e..c4f129e25 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -302,18 +302,18 @@ class CompanyRelationController extends AdminController unset($v['remark']); unset($v['status']); unset($v['verify_log']); + //判断公司id及类型 + if($v['first_company_type'] == 0){ + $t_company_id = $v['second_company_id']; + $t_company_type = $v['second_company_type']; + }else{ + $t_company_id = $v['first_company_id']; + $t_company_type = $v['first_company_type']; + } $where = " - ( - (first_company_type ='{$v['first_company_type']}' and first_company_id = '{$v['first_company_id']}') + (first_company_type ='{$t_company_type}' and first_company_id = '{$t_company_id}') OR - (first_company_type ='{$v['second_company_type']}' and first_company_id = '{$v['second_company_id']}') - ) - AND - ( - (second_company_type ='{$v['first_company_type']}' and second_company_id = '{$v['first_company_id']}') - OR - (second_company_type ='{$v['second_company_type']}' and second_company_id = '{$v['second_company_id']}') - ) + (second_company_type ='{$t_company_type}' and second_company_id = '{$t_company_id}') "; $hasdb = $this->DBModel->where($where)->find(); if(isset($hasdb['id'])){ From 261e63b898ed63111a95ad8889aff92f2826114d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:04:08 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9C=AA=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementLack/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyStatementLack/lists.html b/Application/Admin/View/CompanyStatementLack/lists.html index 23ee9cad4..13e2c55ca 100644 --- a/Application/Admin/View/CompanyStatementLack/lists.html +++ b/Application/Admin/View/CompanyStatementLack/lists.html @@ -205,7 +205,7 @@
- 导出 + {$_page|default=''}
From 994ee29b1dfdaa602ccbac3cb285cf3c96e786c9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:07:03 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B9=B1=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index c47a0ef63..a0c2962bc 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -397,8 +397,8 @@ class CompanyGameRatioController extends AdminController } $id = M("company_game_ratio_log","tab_")->add($save); - addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('index')]); - $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("index")]); + addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("lists")]); } else { $companyList = D("PromoteCompany")->getList(); @@ -439,8 +439,8 @@ class CompanyGameRatioController extends AdminController $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); } M("company_game_ratio_log","tab_")->save($save); - addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('index')]); - $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("index")]); + addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("lists")]); } else { $params = I('get.'); $id = $params['id'] ?? 0; From 265384f2c8194e895eb90698aa8021c896159cdc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:08:31 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index a0c2962bc..db50fa6ee 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -270,7 +270,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=1; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -290,7 +290,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=-1; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -310,7 +310,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=-2; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -351,7 +351,7 @@ class CompanyGameRatioController extends AdminController $company_game_ratio->add($ratiov); } // - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, From a9723597f00e88393a6cc0f68c2a1fdb12cd8574 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:45:26 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E6=9C=AA=E4=BF=AE=E6=94=B9=E9=87=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index db50fa6ee..79522f680 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -431,6 +431,7 @@ class CompanyGameRatioController extends AdminController $save['id'] = $params['id']; $save['ratio'] = $params['ratio'] ?? 0; $save['turnover_ratio'] = $this->setTurnoverRatio($params); + $save['begin_time'] = strtotime($params['begin_time']); $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0; $save['remark'] = $params['remark'] ?? ''; @@ -596,6 +597,9 @@ class CompanyGameRatioController extends AdminController $save['turnover_ratio'] = json_encode($save['turnover_ratio']); } } + if(empty($save['turnover_ratio'])){ + $save['turnover_ratio'] = ''; + } return $save['turnover_ratio']; } From 036a710f2f0e71bd3be1eae9e6f701456bffe271 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:52:41 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8D=E9=87=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementController.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 6b0a5979d..76d726486 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -253,10 +253,14 @@ class CompanyStatementController extends ThinkController $params['first_party_info'] = json_encode($params['first_party_info'],JSON_UNESCAPED_UNICODE); $params['second_party_info'] = json_encode($params['second_party_info'],JSON_UNESCAPED_UNICODE); $params['statement_info'] = json_encode($params['statement_info'],JSON_UNESCAPED_UNICODE); - $params['verify_status'] = 0; - $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); - $params['op_time'] = time(); - M("CompanyStatement","tab_")->save($params); + + $y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find(); + if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){ + $params['verify_status'] = 0; + $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + $params['op_time'] = time(); + M("CompanyStatement","tab_")->save($params); + } $this->ajaxReturn(["code"=>0,"msg"=>"ok"]); }else{ if (!isset($_REQUEST['id'])) { From 38ab488cd07866e3c5ba29a80d478a041c78daaa Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 14:08:04 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 11 ++++ .../Admin/View/CompanyRelation/index.html | 56 ++++++++----------- .../Admin/View/CompanyRelation/lists.html | 54 +++++++----------- 3 files changed, 53 insertions(+), 68 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index c4f129e25..81c3a25ee 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -57,6 +57,11 @@ class CompanyRelationController extends AdminController if(isset($params['company_id'])){ $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; } + if(isset($params['company_type']) && isset($params['company_id'])){ + unset($where['_string']); + $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + } + if(isset($params['settlement_type'])){ $where['settlement_type'] = $params['settlement_type']; } @@ -129,7 +134,13 @@ class CompanyRelationController extends AdminController } if(isset($params['company_id'])){ $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; + } + if(isset($params['company_type']) && isset($params['company_id'])){ + unset($where['_string']); + $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + } + if(isset($params['settlement_type'])){ $where['settlement_type'] = $params['settlement_type']; } diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index 99db117c6..27f727a81 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -195,48 +195,36 @@ $(function(){ $("#search").click(); } }); + + var loop = 1; var company_id = "{$_GET['company_id']??0}"; - $("#company_type").on("change",function(){ var type = $(this).find("option:selected").val(); - var typename=setTypeName(type); - var url = "{:U('getCompanyList')}"+"&type="+type; - $.get(url,function(data){ - var company = data.info; - var companystr = ''; - for (var i in company) { - if(company[i].id == company_id){ - companystr += "" - }else{ - companystr += "" + if(type != ''){ + var url = "{:U('getCompanyList')}"+"&type="+type; + $.get(url,function(data){ + var company = data.info; + console.log(company) + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id && loop==1){ + companystr += "" + }else{ + companystr += "" + } } - } + $("#company_id").html(companystr); + $("#company_id").select2(); + loop++; + }) + }else{ + var companystr = ''; $("#company_id").html(companystr); $("#company_id").select2(); - }) + } }) $("#company_type").change(); - - function setTypeName(type) { - var typename = ''; - switch (type) { - case '': - typename ="请先选择公司类型"; - break; - case '0': - typename = "请选择已方公司"; - break; - case "1": - typename = "请选择上游CP公司"; - break; - case "2": - typename ="请选择联运下游渠道公司";; - break; - default: - break; - } - return typename; - } + }) diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index d20028eb7..46fd3c8dd 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -268,29 +268,35 @@ $(function(){ $("#search").click(); } }); + var loop = 1; var company_id = "{$_GET['company_id']??0}"; - $("#company_type").on("change",function(){ var type = $(this).find("option:selected").val(); - var typename=setTypeName(type); - var url = "{:U('getCompanyList')}"+"&type="+type; - $.get(url,function(data){ - var company = data.info; - var companystr = ''; - for (var i in company) { - if(company[i].id == company_id){ - companystr += "" - }else{ - companystr += "" + if(type != ''){ + var url = "{:U('getCompanyList')}"+"&type="+type; + $.get(url,function(data){ + var company = data.info; + console.log(company) + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id && loop==1){ + companystr += "" + }else{ + companystr += "" + } } - } + $("#company_id").html(companystr); + $("#company_id").select2(); + loop++; + }) + }else{ + var companystr = ''; $("#company_id").html(companystr); $("#company_id").select2(); - }) + } }) $("#company_type").change(); - $(".editRelation").on("click",function(){ var id = $(this).data("id"); var url = "{:U('editRelation')}"+"&id="+id; @@ -382,26 +388,6 @@ $(function(){ }); } }) - function setTypeName(type) { - var typename = ''; - switch (type) { - case '': - typename ="请先选择公司类型"; - break; - case '0': - typename = "请选择已方公司"; - break; - case "1": - typename = "请选择上游CP公司"; - break; - case "2": - typename ="请选择联运下游渠道公司";; - break; - default: - break; - } - return typename; - } }) From fdccc92c43407cf7ae7adafc524bc49a5fb06008 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 14:30:44 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AA=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=84=9A=E6=9C=AC=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- Application/Admin/View/CompanyRelation/lists.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index f305f59a7..199f57717 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -48,7 +48,7 @@ class CompanyStatementSetController extends Controller { public function setDailyCount($stime="now") { if(!IS_CLI){ - // die("只支持脚本访问"); + die("只支持脚本访问"); } if($stime=="now"){ $stime=time(); diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index 46fd3c8dd..782f0779b 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -57,7 +57,7 @@
生效列表 - 审核列表 + 审核列表

公司绑定审核列表

From ec641257b0e31b911b2a1ee34ecd9c0583f82550 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 15:23:53 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 199f57717..8eaf228ad 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -475,7 +475,7 @@ class CompanyStatementSetController extends Controller { $add_data=[]; //1.获取甲乙方信息 - if($v['first_company_type'] == 1){ + if($v['first_company_type'] > 0){ //甲方合作 $pc[$v['first_company_id']]['invoice_type'] = $v['invoice_type']; $pc[$v['first_company_id']]['invoice_content'] = $v['invoice_content']; From 0ba02069a0342ea9b37fb11167bb34defdf295c8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 15:56:54 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A5=E7=82=B9?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 1 + .../CompanyStatementSetController.class.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 5dcb80a9f..e78bd275c 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2159,6 +2159,7 @@ function getGamePromoteCompanyRadio($company_id,$relation_game_id,$endtime,$amou //判断是否有生效 $rwhere = "(end_time = 0 OR end_time >= '{$endtime}') and company_id='{$company_id}' and relation_game_id='{$relation_game_id}'"; $cgr_res = M("CompanyGameRatio","tab_")->where($rwhere)->find(); + // dump( M("CompanyGameRatio","tab_")->where($rwhere)->select(false)); if(empty($cgr_res)){ //模板搜索 //获取公司类型 diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 8eaf228ad..ec60a0635 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -263,6 +263,7 @@ class CompanyStatementSetController extends Controller { $tratio1 = getGameCpRadio($game_id['id'],$va['pay_money'],true); $tratio2 = getGameCpRadio($game_id['id'],$va['pay_money'],false); $tratio = $tratio1-$tratio2; + if($tratio <= 0){continue;} } } @@ -528,6 +529,7 @@ class CompanyStatementSetController extends Controller { $tratio1 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; $tratio2 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); $tratio = $tratio1-$tratio2; + if($tratio <= 0){ continue;} } if($v['type'] == 2){ @@ -766,17 +768,19 @@ class CompanyStatementSetController extends Controller { $game['game_type_name'] = $this->getGameTypeName($va['relation_game_id']); if($type == 1){ - $tratio = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong); + $tratio = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong); }elseif($type == 0){ - $tratio = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); + $tratio = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); }else{ //补点 - $tratio1 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; - $tratio2 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); + $tratio1 = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; + $tratio2 = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); $tratio = $tratio1-$tratio2; + if($tratio <= 0){ + continue; + } } - - if($v['type'] == 2){ + if($type == 2){ $game['increment_ratio']=$tratio; }else{ $game['ratio']=$tratio; From 44f4ddb3778aa179aef4cf397510337eed2e3bd6 Mon Sep 17 00:00:00 2001 From: tping Date: Fri, 19 Jun 2020 16:40:37 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ThinkPHP/Library/Vendor/Alipay2020/Fund.php | 8 ++--- .../cert/alipayCertPublicKey_RSA2.crt | 30 +++++++++---------- .../appCertPublicKey_2021001165628090.crt | 24 +++++++++++++++ 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 ThinkPHP/Library/Vendor/Alipay2020/cert/appCertPublicKey_2021001165628090.crt diff --git a/ThinkPHP/Library/Vendor/Alipay2020/Fund.php b/ThinkPHP/Library/Vendor/Alipay2020/Fund.php index b05394542..53a2d5f14 100644 --- a/ThinkPHP/Library/Vendor/Alipay2020/Fund.php +++ b/ThinkPHP/Library/Vendor/Alipay2020/Fund.php @@ -6,13 +6,13 @@ require_once "aop/request/AlipayFundTransOrderQueryRequest.php"; require_once "aop/request/AlipayFundAccountQueryRequest.php"; class Fund { - private $appCertPath = __DIR__ . "/cert/appCertPublicKey_2021001159678209.crt"; + private $appCertPath = __DIR__ . "/cert/appCertPublicKey_2021001165628090.crt"; private $alipayCertPath = __DIR__ . "/cert/alipayCertPublicKey_RSA2.crt"; private $rootCertPath = __DIR__ . "/cert/alipayRootCert.crt"; private $gatewayUrl = "https://openapi.alipay.com/gateway.do"; - private $appId = "2021001159678209"; - private $alipayUserId = '2088631242187552'; - private $rsaPrivateKey = 'MIIEogIBAAKCAQEApuiUWwiE9apUAWLaX8SDYgt2oQnGCtT60dZvpMMHCuGR71HKCoLuCbgoZ3GUGhS9PByQZp/hNygEu6GzQwNTj5PiWMVrlfL7Xjkcpg+JbSiR3TUSJfYO2uLa+atJCQDNhsE6cfdcE4VHiSU5TK4ezBaIcYBPmzM6xKdQ6BblCM7fakTlVct+gvrE69M6XoyoM5VT6/lRwTIscWfwkyd/lps4jBwhuVMDboulk1BXQ2+daIQGqK4QQfQtC0bvREC+gwwmFaIfrw3dF/nOVEUEyhx4SFb7RzQv9mZx9HL4P4qCRvGl+jE5NE9hUWNz2pajR2cg7DxHDEMB0dSz8LRW9QIDAQABAoIBAADqDz38avYJi9JCH14c7ndQBsNVEV+n0QPrP8tQQi6eE7WS5h9uni0xdA81ARGvgWXd5jCZuZsavgPlG91HHGMR9VB1LGSy4wueFnkWZrNRYJMsoj/Q/D3Ytkhd1tWUyottbYuIRlnZBg5LROgVoBeQHAk7IbSA8FZ5cCkFTxXgQfOHd2yWJGkI1bz9MCTawT96fEBAowq2g28LsT44/EiJIGXY4hv7SOpZIIp9JZfmEDO9vOf5nkkZbsli0KPQPkTvly3p0YfMATqsxMLue1lwfHmueRMdk8p31aaz3c2aOVyvtyNae/UP3/O47HgAI9LXoAbzChlMi15o5YTyaxUCgYEA56ThYW4+9CB1Q+qFkz4KyarI4//AHyha/LELXpeRICidxDw6PQdfBi/75udbQDI0tISJjio+S8sKUlCWcHi/1/A8k0aZBN1rs9mTVQrN1zMbSgoYOHOIGE4147ig5vU6gjvpI/SPbeg3BLg3rd/3IOsDmh4HoVhSUINUwJ9dK2MCgYEAuHU5eeInSKeEPWMMqql+OxHnA7g/Z9RYJsuuXrNm8qsGDxJbJmVfBsa7Uo466hwr3OhMuk2ShensEzFYxDrURgADjAgVn7puzMUtHYMNcK06Se8g/Crq6UYM0OGaFfKVMgX8gq+eAdDZmX+WmdJBgakVLfjxlQ94ar5EGe+w/8cCgYB4TjyzsmNFvRnKJSIsn7tQk790Ep7AT+A5fuXNweAgmJeflDwW+B4VA5TLjnro82pGGtOqHyxths0chTgsv7m7N8zuHGtaiHjoVmbbcxoG20cgA/AiWXZkUTJRy9DdQp2Zh+4Eu35GcaUpcVeRmVErKoObZl9GH63YnOzGgb4MywKBgGebWHRQhfY2OX3tg7DcUQ3GyXZ6aAre58CqyT9iD2Igk9+lVNNlPxHkUFVXlFnpBu4nAOnoJnPXZ4WEQzK9RHwpB9UAuXylUBTub5/S+5qdgk8C5Qke5iGu+gXdohnPzuNxH1scX2jvsTmZw7KUubylh0LyQGeUb/Os+T2EN2wDAoGASbDD8hLDI64DpDp73XHbKbrdHaz7c9NkUsLD3FB6nmGQtAD8Gvuvd3PvhhBGz5O/ndUU0KSdZb4Yg3/3Qx4TWIJhobkXsNLkv+aPNxyjQBkFfJmXjsx2phsvjPNRICBeWlLKbB30SbZ6uCs6uypebSzIxdjT2riFmuuaJtsZJVM='; + private $appId = "2021001165628090"; + private $alipayUserId = '2088331082835421'; // pid + private $rsaPrivateKey = 'MIIEowIBAAKCAQEAmDggf4zno5KmKKEv0gbKctXyceEylTbWgZhannFGDXBkVkUqKC1btcKOFRWteVcQDFFCAgMobiTxH4rpIopyoC3x66mAynTVQnEWYFCyc628ZMAJ6aXQMvYNmzJgDczX8YI9taXbOf2YtV3uLdSs6t3Qm/rCBfrn/wj30QNsUm1f8yqCiHVwZ3jTM3ygKCr4SU3XjTKa1IqlYvGgIHrNHmTwATxvNRXa9pDTvSFz/zdvFxveWBn9PDhiNVebgEDFq0Xtv//z78UzRC3T8vV7HfCvcuR/gH0bVhvTzK55VlXlANM8o06tGsOj1jpJUGjUeMe2yiH9bDO810zNuri9LwIDAQABAoIBADoZQh4s88S1FoJvc0cgnGjUTCM3Jw1YzurL8dqDtY8vlLxwzbRkC5sGVSCrE3k6x79LzHvkJKxVoUq+xFkQqsuEfc/K9INRsIwZicbdRh9s8nkp6x6o0RyCWZMg2RSrWMivQ0pvsYsixgSDg4Mup4lFfHfsb93EdIQdMikuu0uCKFcXLO8UTma7mBRLdOis11vaZv7ROVftEUww9MZHCh/AJl7S73RvwZwZHQ9H5Y7fJ8EFqARJmTDEwDaOUQUGVTVho85KIlvpQ9gYbwy9R+xbftBSra+/THTiYjcMPR06wbf0dQwSunsz/NK4guVIpjKD23hQI1XcTcvxl6qRvjECgYEA12oro1NV9U4wVdwbbGzonW3hyNIE8pNbs3AE4q8pJF8aTVVnQuicunrgfK1W88urrngMMx+byg4ZnxUmahcyU+fId+z6FZbfypij+lMRpF85oQ0bhcXn04dcJimMlNrV4i62GeVcKtaAvoVXNYOXeS7SHtZ2nI0f7ArHbdgpbgMCgYEAtOXtfm3+CmNrlbhyPXPjUbNY3q3Uo09X6R01zYSvIobl3hoVVsw+7zJIAAaCTLcRxiVhvK5QVdRi/ohUphu2YugJx8fzNw6zl0iR/B9dWpDplMFDn3VOuS5UBeIHDn1C/A8RO7VKmYpCSAyHZxaxg0sAsAqjn9pk0ClvFpshcmUCgYEAwxXL32Yher8M1zU3QMKBB9HzoMNS57y8V40jX4fyYpYeY9rsYZP4HIobs83n6XKSULc3lTUTCbIrUf79gybu1T4cNz/OXK7+jaQfHR0N5Sa4MjqEqmnIwbDcq1MFlel5uhVDpcAp8EHC5sgrarN6Aq18baEcWjsUpdg9NCWHn7ECgYAVcyodErfLzYwlPbC2Hra2qliAVwZesvrOlnsZuoD1zB8Xneon16IixMiK0DrFE/QUlbwoHldCRiPS4KGA7MpMogz+1nO9dI3RA3bj+WgdZA9+Zwg4sTU7egXWiL2jdzDpKHQ3q0CEQkOnvWyUybkUw2D6fth2DPRlRnR4rr5hjQKBgHxl/E/sWi8iTN1thUbWzs2Q/8Qt+CHiXnWEU1rraV/0OlE4wbYVyFxURuZHCNdpTyuj0LS28WanbjJsmceL//+hy5qcjSBFJ8UO4Mw8pwDM8SEfWbo/MHNV48ElovOXxLrKTuvQUR6duWkv73qZYOpPYr+Rl0ylHGvNsqsLY7LZ'; public function transfer($aliAccount, $realName, $orderId, $amount, $title='') { diff --git a/ThinkPHP/Library/Vendor/Alipay2020/cert/alipayCertPublicKey_RSA2.crt b/ThinkPHP/Library/Vendor/Alipay2020/cert/alipayCertPublicKey_RSA2.crt index 50437508f..8fc7dd8be 100644 --- a/ThinkPHP/Library/Vendor/Alipay2020/cert/alipayCertPublicKey_RSA2.crt +++ b/ThinkPHP/Library/Vendor/Alipay2020/cert/alipayCertPublicKey_RSA2.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDsjCCApqgAwIBAgIQICAFCWxavNeaIxWMns+DwjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +MIIDtTCCAp2gAwIBAgIQICAGGS5p70QviSuHRfPPBjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs -YXNzIDIgUjEwHhcNMjAwNTA5MDg1NTE3WhcNMjIwNTA5MDg1NTE3WjCBkjELMAkGA1UEBhMCQ04x -LTArBgNVBAoMJOa1t+WNl+S4h+ebn+WkqeS4i+enkeaKgOaciemZkOWFrOWPuDEPMA0GA1UECwwG -QWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWP -uC0yMDg4NjMxMjQyMTg3NTUyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj1gR40Zr -H2ZoHTmKAhiEcPEsc0vM7Wbeui8SBrjntEVjHCLF4mE9u9V7uYyrs0b/RGlh5Lxqe3AuterzAWOH -GTckg2GOXXRagYYekpTl77fTLmm99vI+uTA7mjvs0PLm39/MjuK5hIr39eQgctXM+m4oxSht5hIG -ahyC9nk5uId0b1oae+tAtT7mBl/9N9rcsDuoNlX447IjDsi/WxKMsI6C2rI+b6p2BBG46550s/9m -wrCpWHHeu7jOx9gS8501axUd4cjqOLRlxPuEO4Il6ZCnsI2U91/G4tKgjgXkNdTGXqP+vqvm7Mzp -YL3SMmqyboEJdKa3vDbQAcfThSPrQwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcN -AQELBQADggEBAHliZVSXlOTzPzrBViOuh0riaWSLzz0L+1VwsIwVSAY6U3qMHVFKst6JmNV7T8ia -y2EW219Q8m6iSE+JMzJTyXvz5xylCHmaAuWMY9iqmsvfVmNbmYF/f2iwdULqSIeP8ZtbXKy/fgra -a6dCWST29d2PVzE7cF48tOYvqc6TQj6wUoXBDV4iU4onX1JJbDA2mQcfOzplRRJh70OUqqnbyTig -5aFQJX36KnZLxN6KBo9Y9CbGrdA/VTHBwaDhj6/NbauuGpf8swD9kHZv02HAQhpbCdOSQa+bZd+d -gEOApFe9LsoQvlbyqyu14bXUNwXd/tilisjyqoDA96CSx6gkvpA= +YXNzIDIgUjEwHhcNMjAwNjE5MDc1OTUwWhcNMjIwNjE5MDc1OTUwWjCBlTELMAkGA1UEBhMCQ04x +MDAuBgNVBAoMJ+emj+W7uumHkeiPoOiPnOe9kee7nOenkeaKgOaciemZkOWFrOWPuDEPMA0GA1UE +CwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWF +rOWPuC0yMDg4MzMxMDgyODM1NDIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGA7 +3xiJnGXsrIPCqTSgq9C/4uNArsX3/xBE1qSl6n4X2NR+oejR9fVzM3+rlo4npJPUDh5sq3udfUNW +kC5Gb4MzHyNExNWD97pV+xNjwwKIV95ysll44qNFhSIeeiHg3duPV9ZJ3GxUS2lAE0Mw3+6eU5QF +AjYHmBsozCXz3RKk9UxVNBR3VkjLzkUh7kyg00kv/pIFM03i4l804FQ3ssbzE5FSL9maucibwRib +AnStR778bM9r9PLNZ48v9XeAGThfk9WFoOfbJB8UQMgO05QmT77iWMuOJZqP6Q1w1LF1W8eM1jz4 +MzjgTyauYndZBqvXnyPBKnUYoIBNI/6bGwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZI +hvcNAQELBQADggEBAAHPfzWNY149me8+Rxnf0BXI09At2z/JpF3htT09lRkma1qSuIwwKkZzvgOm +pTnUE7+3YJ6lxzTrdEAeL3Z6lY/YQJjW/ewrqfJBtducXeeTdoBlZLNLfAR/6ap4HtsUH33ftjzK +WA9JyiqKiAwqfNDJo/RjxPLCAwMFXmfoZdwgF7pib/I6Y4HkrU8RFcFEg+I/5DHbR6giaFflZ6n/ +lhbFo+t8luMO+4J3eKdE1Qp/KuohbWxXpc+4AtWYMxUuhWulFP87c1SUKSWinnTrtLpamvFkYyIH +zPuF6lENjKScnzFUZTjkGs5Ms1LzfrlnjN7ZX6c4M3qQGDlktyaHwYk= -----END CERTIFICATE----- diff --git a/ThinkPHP/Library/Vendor/Alipay2020/cert/appCertPublicKey_2021001165628090.crt b/ThinkPHP/Library/Vendor/Alipay2020/cert/appCertPublicKey_2021001165628090.crt new file mode 100644 index 000000000..784d39da3 --- /dev/null +++ b/ThinkPHP/Library/Vendor/Alipay2020/cert/appCertPublicKey_2021001165628090.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEtDCCA5ygAwIBAgIQICAGGaaBO7FBxTQH7IscmDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjAwNjE5MDc1OTUwWhcNMjIwNjE5MDc1OTUwWjB8MQswCQYDVQQGEwJDTjEw +MC4GA1UECgwn56aP5bu66YeR6I+g6I+c572R57uc56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQL +DAZBbGlwYXkxKjAoBgNVBAMMITIwODgzMzEwODI4MzU0MjEtMjAyMTAwMTE2NTYyODA5MDCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg4IH+M56OSpiihL9IGynLV8nHhMpU21oGYWp5x +Rg1wZFZFKigtW7XCjhUVrXlXEAxRQgIDKG4k8R+K6SKKcqAt8eupgMp01UJxFmBQsnOtvGTACeml +0DL2DZsyYA3M1/GCPbWl2zn9mLVd7i3UrOrd0Jv6wgX65/8I99EDbFJtX/Mqgoh1cGd40zN8oCgq ++ElN140ymtSKpWLxoCB6zR5k8AE8bzUV2vaQ070hc/83bxcb3lgZ/Tw4YjVXm4BAxatF7b//8+/F +M0Qt0/L1ex3wr3Lkf4B9G1Yb08yueVZV5QDTPKNOrRrDo9Y6SVBo1HjHtsoh/WwzvNdMzbq4vS8C +AwEAAaOCASkwggElMB8GA1UdIwQYMBaAFHEH4gRhFuTl8mXrMQ/J4PQ8mtWRMB0GA1UdDgQWBBQc +ZHMKu7te5Gjs21/AcjE6mO+x/TBABgNVHSAEOTA3MDUGB2CBHAFuAQEwKjAoBggrBgEFBQcCARYc +aHR0cDovL2NhLmFsaXBheS5jb20vY3BzLnBkZjAOBgNVHQ8BAf8EBAMCBsAwLwYDVR0fBCgwJjAk +oCKgIIYeaHR0cDovL2NhLmFsaXBheS5jb20vY3JsNDIuY3JsMGAGCCsGAQUFBwEBBFQwUjAoBggr +BgEFBQcwAoYcaHR0cDovL2NhLmFsaXBheS5jb20vY2E2LmNlcjAmBggrBgEFBQcwAYYaaHR0cDov +L2NhLmFsaXBheS5jb206ODM0MC8wDQYJKoZIhvcNAQELBQADggEBAGQL5J9FSNgCQ5vL2kIZYGvu +1gsaqdcmlceVxP3yd9hBdVFDZ4sBCuiXkWhZZtiHeVgWklXEIj8rQuZ5KkDBzBa/qS6AadL3g108 +kQuEAlrIj7Gf9Nl9WD+mavASV1khI9297WKgWE70n59h9FDCkUL2jtLDSAcvOP3bk4aMNXjIFsWb +7rrHsn4S4aGdRhunI9Gumlkp0Si/YHrvC2LoHd2NZbFGFKR5bGh/JIUFdlal0+fUZ1UMxlrHe1HZ +NNMnQonmgovAsCfzkrhADofXT3X7bjruK0teffRk1imtzgjtjscxlVkZWSrnqIbZ03vpYSUn2Ioe +Zs9+maCIK7pv5I8= +-----END CERTIFICATE----- \ No newline at end of file From a2454e0446ef03876097ac36a3cb01945557f0c7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Sat, 20 Jun 2020 09:27:37 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E6=B8=B8=E4=B8=AA=E4=BA=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 76d726486..4783c147d 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -390,18 +390,18 @@ class CompanyStatementController extends ThinkController } if ($data['company_belong'] == 9) {//上游 excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money); - } else {//下游 - if($dbres["company_type"] == 1){ + } else { + //下游 + // if($dbres["company_type"] == 1){ excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money); - }else{ - $data['statement_begin_time'] = date('Ymd',$data['statement_begin_time']); - $data['statement_end_time'] = date('Ymd',$data['statement_end_time']); - $data['statement_count'] = count($data['statement_info']); - // dd($data); - $this->assign("data",$data); - $this->display("exportPuStatement"); - } - + // }else{ + // $data['statement_begin_time'] = date('Ymd',$data['statement_begin_time']); + // $data['statement_end_time'] = date('Ymd',$data['statement_end_time']); + // $data['statement_count'] = count($data['statement_info']); + // // dd($data); + // $this->assign("data",$data); + // $this->display("exportPuStatement"); + // } } } //汇总 From 53004adf5d38dba62e8061929b90fc9c781b788e Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 22 Jun 2020 09:31:55 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 1 - .../CompanyStatementController.class.php | 72 +++++++++++- .../CompanyStatementSetController.class.php | 38 ++++--- .../Admin/View/CompanyStatement/lists.html | 107 +++++++++++++++++- 4 files changed, 197 insertions(+), 21 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 79522f680..968f39e3d 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -111,7 +111,6 @@ class CompanyGameRatioController extends AdminController $this->assign("companyList",D("PromoteCompany")->getList()); $this->assign("gameList",D("Game")->getRelationGameLits()); $this->display(); - dd( $dbres); } public function lists() diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 4783c147d..3546bf558 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -700,7 +700,74 @@ class CompanyStatementController extends ThinkController $savedata['statement_end_time'] = $v['statement_end_time']; } } - //设定并保存数据 + //新增结算 + //获取要结算的公司及日期 + public function getNewStatement() + { + $senddata = []; + //1.获取要计算的公司 + $statement = M("company_statement","tab_")->field("count(id) count,company_id")->group("company_id")->select(); + $has_company_id =implode(",",array_column($statement, 'company_id')); + if(empty($has_company_id)){ + $where = "1=1"; + }else{ + $where = "(first_company_type > 0 AND first_company_id NOT IN ({$has_company_id}) ) OR ( second_company_type > 0 AND second_company_id NOT IN ({$has_company_id}) )"; + } + + $relation = M("company_relation","tab_")->field("first_company_id,first_company_type,second_company_id,second_company_type")->where($where)->select(); + $company_id = []; + foreach($relation as $k=>$v){ + if($v['first_company_type'] == 0){ + $company_id[]=$v['second_company_id']; + }else{ + $company_id[]=$v['first_company_id']; + } + } + if(count($company_id) < 1){ + $this->ajaxReturn(["error"=>'无新增关系，无需重算']); + } + $senddata['company_id'] = implode(",",$company_id); + //获取要结算的日期 + $start = strtotime('-1 month'); + $end = time(); + + $temp_datelist = get_date_list($start,$end,1); + $datelist = []; + foreach($temp_datelist as $k=>$v){ + $w = (int)date("w",strtotime($v)); + $d = (int)date("d",strtotime($v)); + if($w == 1 || $d == 1){ + $datelist[] = $v; + } + } + $senddata['datelist'] = $datelist; + $senddata['count'] = count($datelist); + + $this->ajaxReturn(["success"=>'ok',"data"=>$senddata]); + } + public function updateNewStatement() + { + $company_id = $_REQUEST['company_id']; + $date = $_REQUEST['date']; + $CompanyStatementSet = A("CompanyStatementSet"); + // dd($CompanyStatementSet); + $stime = strtotime($date); + $w = (int)date("w",strtotime($date)); + $d = (int)date("d",strtotime($date)); + if($w == 1){ + $CompanyStatementSet->cpStatement(0,$stime,$company_id,false); + $CompanyStatementSet->promoteCompanyStatement(0,$stime,$company_id,false); + } + if($d == 1){ + $CompanyStatementSet->cpStatement(1,$stime,$company_id,false); + $CompanyStatementSet->cpStatement(2,$stime,$company_id,false); + $CompanyStatementSet->promoteCompanyStatement(1,$stime,$company_id,false); + $CompanyStatementSet->promoteCompanyStatement(2,$stime,$company_id,false); + } + + $this->ajaxReturn(array("success"=>"ok","data"=>[])); + } + public function OpAuth($info) @@ -762,7 +829,8 @@ class CompanyStatementController extends ThinkController "launch"=>"对外发起", "pool"=>"发起汇总", "updateStatement"=>"重算金额", - "export"=>"批量导出" + "export"=>"批量导出", + "updateNewStatement"=>"新增结算", ]; $resarr = []; foreach ($mentBtn as $k => $v) { diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index ec60a0635..3d3b16a36 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -97,7 +97,7 @@ class CompanyStatementSetController extends Controller { * 上游结算 * @param [string] $type 0:周结 1:月结 2：周结补点 */ - public function cpStatement($type,$stime,$company_id=false) + public function cpStatement($type,$stime,$company_id=false,$recount=true) { $t = $this->setBeginAndEndTime($type,$stime);; $begintime = $t[0]; @@ -109,7 +109,7 @@ class CompanyStatementSetController extends Controller { ]; }else{ $where = [ - "_string"=>"(first_company_type = '1' AND first_company_id = '{$company_id}') OR (second_company_type = '1' AND second_company_id = '{$company_id}')" + "_string"=>"(first_company_type = '1' AND first_company_id in ({$company_id}) ) OR (second_company_type = '1' AND second_company_id in ({$company_id}) )" ]; } //获取哪些要结算 @@ -339,12 +339,11 @@ class CompanyStatementSetController extends Controller { return; } //添加 - if($company_id === false){ + if($recount && $company_id !== false){ //非重算 - $StatementDb->add($add_data); - }else{ return $add_data; } + $StatementDb->add($add_data); } } @@ -402,9 +401,8 @@ class CompanyStatementSetController extends Controller { /** * 下游结算 */ - public function promoteCompanyStatement($type,$stime,$company_id=false) + public function promoteCompanyStatement($type,$stime,$company_id=false,$recount=true) { - $t = $this->setBeginAndEndTime($type,$stime); $begintime = $t[0]; $endtime = $t[1]; @@ -416,7 +414,7 @@ class CompanyStatementSetController extends Controller { ]; }else{ $where = [ - "_string"=>"(first_company_type = '2' AND first_company_id = '{$company_id}') OR (second_company_type = '2' AND second_company_id = '{$company_id}')" + "_string"=>"(first_company_type = '2' AND first_company_id in ({$company_id}) ) OR (second_company_type = '2' AND second_company_id in ({$company_id}) )" ]; } //获取哪些要结算 @@ -549,7 +547,6 @@ class CompanyStatementSetController extends Controller { $game['statement_type']=0; $add_data['statement_info'][] = $game; } - $add_data['platform_amount'] = $add_data['pay_amount']; if($type < 2){ //非补点计算奖罚 @@ -601,16 +598,23 @@ class CompanyStatementSetController extends Controller { return; } //添加 - if($company_id === false){ + if($recount && $company_id !== false){ //非重算 - $StatementDb->add($add_data); - }else{ return $add_data; } + $StatementDb->add($add_data); + + + // if($company_id === false){ + // //非重算 + // $StatementDb->add($add_data); + // }else{ + // return $add_data; + // } } } //设定开始结束时间 - protected function setBeginAndEndTime($type,$stime){ + public function setBeginAndEndTime($type,$stime){ if($type == 0){ $begintime = mktime(0,0,0,date('m',$stime),date('d',$stime)-7,date('Y',$stime)); $endtime = mktime(0,0,0,date('m',$stime),date('d',$stime),date('Y',$stime))-1; @@ -632,7 +636,7 @@ class CompanyStatementSetController extends Controller { return [$begintime,$endtime]; } //获取推广公司推广金额 - protected function getPromoteCompanySpend(&$pcList,$idarr,$begintime,$endtime){ + public function getPromoteCompanySpend(&$pcList,$idarr,$begintime,$endtime){ $res = []; //获取推广员 if(count($idarr) == 0){return $res;} @@ -922,7 +926,7 @@ class CompanyStatementSetController extends Controller { /** * 保存信息汇总信息 */ - protected function savePromotateUserPool($data){ + public 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){ @@ -947,7 +951,7 @@ class CompanyStatementSetController extends Controller { /** * 获取公司额为信息 */ - protected function getCompanyOtherInfo($company_info,$company_id) + public function getCompanyOtherInfo($company_info,$company_id) { $pl = M("promote_company","tab_") ->alias('pc') @@ -965,7 +969,7 @@ class CompanyStatementSetController extends Controller { /** * 获取游戏分类名称 */ - protected function getGameTypeName($relation_game_id){ + public function getGameTypeName($relation_game_id){ return M("Game","tab_")->field("game_type_name")->where("relation_game_id = '{$relation_game_id}'")->find()['game_type_name']; } diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index db5e44e09..dd34b52a4 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -56,11 +56,33 @@ font-weight: 400; font-size: 14px; } + .main-place .question_content:before{ + right: 20px; + left: auto; + }

联运平台结算单管理

-

+

+
+ ? +
    +
  • 数据相关说明
    • +
  • + 重算金额: + 仅会重算当前公司，当前时间的结算金额 +
    • +
  • + 撤销汇总: + 需要进行重算才可以再次汇总 +
    • +
  • + 新增结算: + 对新增绑定的公司进行结算，仅统计当月数据(不含下游个人) +
    • +
+
@@ -235,6 +257,15 @@ {$_page|default=''}
+ @@ -256,6 +287,66 @@ Think.setValue('{$key}',"{$vo}"); $(".select_gallery").select2(); + var DATA={}; + var MSG={ + showmsg:function(str){ + $("#creat_msg").show(); + $("#tip_msg").html(str); + }, + hidemsg:function(){ + $("#creat_msg").hide(); + $("#tip_msg").html(''); + } + } + var COMPARE={ + publiucAjax:function(url,senddata,callback){ + $.ajax({ + type: 'post', + url: url, + data:senddata, + success: function(data) { + if(data.success){ + callback(data.data); + }else{ + MSG.hidemsg(); + layer.alert(data.error); + return false; + } + + }, + error:function(){ + MSG.hidemsg(); + layer.alert("网络错误或超时"); + return false; + } + }); + }, + //获取基础参数 + getNewStatement:function(callback){ + MSG.showmsg("初始化获取校验中...."); + COMPARE.publiucAjax("{:U('getNewStatement')}",{},function(data){ + DATA = data; + DATA.now = 1; + MSG.showmsg("校验通过，开始统计 [0/"+DATA.count+"] ......"); + callback(); + }); + }, + //开始统计 + updateNewStatement:function(callback){ + var senddata = {date:DATA.datelist[(DATA.now-1)],company_id:DATA.company_id}; + console.log(senddata); + COMPARE.publiucAjax("{:U('updateNewStatement')}",senddata,function(){ + MSG.showmsg("开始统计 ["+DATA.now+"/"+DATA.count+"] ......"); + DATA.now ++; + if( DATA.now > DATA.count){ + callback(); + }else{ + COMPARE.updateNewStatement(callback) + } + }); + + } + }