From 4d8e7de144e340970b62b6da687942a22afc0afd Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 8 Jun 2021 15:20:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementOfflineController.class.php | 16 +++++++++++----- .../CompanyStatementPoolController.class.php | 3 +++ .../View/CompanyStatementPool/viewPuPool.html | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index cc1da063f..8a51a2e77 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -586,7 +586,7 @@ class CompanyStatementOfflineController extends ThinkController ,'pay_time'=>strtotime($payment_time) ]; - $unPayData = SM("company_statement_info_part","tab_") + $unPayData = M("company_statement_info_part","tab_") ->field("sum(statement_money) statement_money,info_id") ->where(["pay_status"=>0]) ->group("info_id") @@ -597,7 +597,7 @@ class CompanyStatementOfflineController extends ThinkController $handleData[$value['info_id']] = $value['statement_money']; } - $payData = SM("company_statement_info_part","tab_") + $payData = M("company_statement_info_part","tab_") ->field("sum(statement_money) statement_money,info_id") ->group("info_id") ->select(); @@ -613,11 +613,16 @@ class CompanyStatementOfflineController extends ThinkController $time = date("Y-m-d H:i:s",time()); $unPayAmount = $value['statement_money']-$handlePayData[$value['id']]; $saveData['remark'] = $value['remark']; + + $partInfo = M("company_statement_info_part","tab_")->where(['info_id'=>$value['id']])->order("id desc")->find(); + $partCompanyInfo = json_decode($partInfo['company_info'],true); + $saveData['company_info'] = $partInfo['company_info']; + if($handleData[$value['id']]) { - $saveData['remark'] = "{$value['remark']} {$_SESSION['onethink_admin']['user_auth']['username']}于{$time}已打款{$handleData[$value['id']]},剩余{$unPayAmount}"; + $saveData['remark'] .= ";{$_SESSION['onethink_admin']['user_auth']['username']}于{$time}向({$partCompanyInfo['payee_name']}/{$partCompanyInfo['opening_bank']}/{$partCompanyInfo['bank_account']})打款{$handleData[$value['id']]},剩余{$unPayAmount}"; } - SM("company_statement_info_part","tab_") + M("company_statement_info_part","tab_") ->where(['info_id'=>$value['id'],'pay_status'=>['neq',1]]) ->save(["pay_status"=>1,'pay_time'=>strtotime($payment_time)]); @@ -629,7 +634,8 @@ class CompanyStatementOfflineController extends ThinkController "pay_status"=>1, "pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]), "remark"=>$saveData['remark'], - 'pay_time'=>strtotime($payment_time) + 'pay_time'=>strtotime($payment_time), + 'company_info'=>$partInfo['company_info'] ]); } else { $companyStatementInfo->where(['id'=>$value['id']])->save($saveData); diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index cf136000d..83f736809 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -779,6 +779,9 @@ class CompanyStatementPoolController extends ThinkController $cline = $line+1; if($is_export){ $v['statement_money'] = "=ROUND("; + $v['remark'] = str_replace(";","\n",$v['remark']); + }else{ + $v['remark'] = str_replace(";","
",$v['remark']); } $handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line); $v['statement_info'] = $handle_data; diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index e008db558..26e030d3c 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -207,7 +207,7 @@ 是 否 否 是 - {$com.remark} + {$com.remark} From 24e4f77a98036153c34cfc47b34336a2cffa7ba5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 8 Jun 2021 18:22:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=AF=9B=E5=88=A9=E7=8E=B0=E5=9C=A8bug?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameMarginSetController.class.php | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/GameMarginSetController.class.php b/Application/Admin/Controller/GameMarginSetController.class.php index bf929db07..9b9b9a8ce 100644 --- a/Application/Admin/Controller/GameMarginSetController.class.php +++ b/Application/Admin/Controller/GameMarginSetController.class.php @@ -17,11 +17,12 @@ class GameMarginSetController extends Controller { private $year;//年份 private $adddata;//要添加的数据 private $inSideCompanyIds; - // public $result=''; + private $debugGame=false; + private $debugStr=''; /** * 更新某月数据 */ - public function setFreeMonth($count_date) + public function setFreeMonth($count_date,$debug_game=false) { //设置转换精度 ini_set('serialize_precision',14); @@ -37,6 +38,7 @@ class GameMarginSetController extends Controller { $this->month= $tarry[1]; $this->beginThismonth=mktime(0,0,0,$tarry[1],1,$tarry[0]); $this->endThismonth=mktime(0,0,0,$tarry[1]-0+1,1,$tarry[0])-1; + $this->debugGame=$debug_game; $this->reCount(); $this->setGameMargin(); @@ -66,6 +68,10 @@ class GameMarginSetController extends Controller { $this->getPuStatement(); $this->getPcStatement(); $this->setMarginCount(); + if($this->debugGame){ + $str = $this->debugGame . PHP_EOL."公司名称,团体归属,时间,流水,分成". $this->debugStr . PHP_EOL; + echo $str; + } echo "{$this->year}-{$this->month}生成成功".PHP_EOL; } /** @@ -223,6 +229,9 @@ class GameMarginSetController extends Controller { $this->adddata[$val['game_name']]['pu_pay_amount'] = $val['pay_amount']; $this->adddata[$val['game_name']]['pu_statement_amount'] = $val['sum_money']; } + if($this->debugGame && $this->debugGame == $val['game_name']){ + $this->debugStr .= (PHP_EOL."{$v['company_name']},外团,{$time['begin_time']}-{$time['end_time']},{$val['pay_amount']},{$val['sum_money']}"); + } } } } @@ -293,6 +302,10 @@ class GameMarginSetController extends Controller { $this->adddata[$val['game_name']]['pu_pay_amount'] = $val['pay_amount']; $this->adddata[$val['game_name']]['pu_statement_amount'] = $val['sum_money']; } + + if($this->debugGame && $this->debugGame == $val['game_name']){ + $this->debugStr .= (PHP_EOL."{$v['company_name']},外团,{$time['begin_time']}-{$time['end_time']},{$val['pay_amount']},{$val['sum_money']}"); + } } } } @@ -322,6 +335,13 @@ class GameMarginSetController extends Controller { }else{ $this->adddata[$val['game_name']]['pu_statement_amount'] = $val['sum_money']; } + + if($this->debugGame && $this->debugGame == $val['game_name']){ + $beginThismonth = date("Y.m.d",$this->beginThismonth); + $endThismonth = date("Y.m.d",$this->endThismonth); + $this->debugStr .= (PHP_EOL."{$v['company_name']},外团,{$beginThismonth}-{$endThismonth},0,{$val['sum_money']}"); + } + } } } From 31fa1fcfc223c182188aaa76a9961b1c6adf8a0d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 9 Jun 2021 18:07:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=8A=E6=B8=B8cp=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=87=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 21 +++++++++++++++++-- Application/Admin/View/Partner/export.html | 2 ++ Application/Admin/View/Partner/lists.html | 9 ++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 2bbcbd793..e31f815f6 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -26,7 +26,8 @@ class PartnerController extends ThinkController public function lists() { $model = M($this->modelName, 'tab_'); - $map = []; + $now = time(); + $map = ["_string" => "1=1 "]; $id = intval(I('id', 0)); if (!empty($id)) { $map['tab_partner.id'] = $id; @@ -56,6 +57,14 @@ class PartnerController extends ThinkController $time_end = strtotime($_REQUEST['timeend'])+ 86399; $map["_string"] = "(contract_start_time <= {$time_end} ) OR (contract_end_time <= {$time_end})"; } + if (!empty(I('contract_type'))) { + if(I('contract_type') == 1){ + $map['_string'] .= " AND (contract_end_time = 0 OR contract_end_time > {$now})"; + }else{ + $map['_string'] .= " AND (contract_end_time <= {$now} AND contract_end_time != 0)"; + } + } + if($_REQUEST['original_package_name']) { $game_map['original_package_name'] = ['like',"%{$_REQUEST['original_package_name']}%"]; @@ -241,6 +250,14 @@ class PartnerController extends ThinkController $contract_end_time = $value['contract_end_time'] ? time_format($value['contract_end_time'], 'Y/m/d') : '-'; } $value['contract_time'] = $contract_start_time . '-' . $contract_end_time; + //判断合同是否过期 + if($value['contract_end_time'] == 0){ + $value['contract_str'] = "未过期"; + }elseif($value['contract_end_time']-0+86399 < time()){ + $value['contract_str'] = "已过期"; + }else{ + $value['contract_str'] = "未过期"; + } $validity_start_time = $value['validity_start_time'] ? time_format($value['validity_start_time'], 'Y/m/d') : '-'; if($value['validity_start_time']){ @@ -265,7 +282,7 @@ class PartnerController extends ThinkController } } - + // dd($parseData); if($is_export){ $this->assign('listData', $parseData); $GetData = $_GET; diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html index 16a91ae7d..9b4eb4c34 100644 --- a/Application/Admin/View/Partner/export.html +++ b/Application/Admin/View/Partner/export.html @@ -72,6 +72,7 @@ 是否有游戏资质 是否签署合同 合同期限 + 合同是否过期 生效期限 公司税号 开票税点 @@ -136,6 +137,7 @@ {$data.is_sign_contract|default="--"} {$data.contract_time} + {$data.contract_str} {$data.validity_time} {$data.company_tax_no|default="--"} {$data.invoice_rate|showPercent} diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index 1a173ce00..b847eecba 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -84,6 +84,13 @@ +
+ +
搜索 @@ -114,6 +121,7 @@ 游戏分成比例 合同期限 + 合同是否过期 结算周期 户名 账号 @@ -156,6 +164,7 @@ {$data.contract_time} + {$data.contract_str} {$data.settlement_type|default="--"} {$data.payee_name|default="--"} {$data.bank_account|default="--"} From 78a24c78f5946706b0bb52882d48a6a5ce44e68b Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 11 Jun 2021 13:58:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/TestingResourceService.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index 34a5ffb69..6015fdb2b 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -338,12 +338,12 @@ class TestingResourceService throw new \Exception('该玩家账号为测试账号，无法绑定'); } - /* $existBind = M('testing_binding', 'tab_')->field(['id'])->where(['game_id' => $gameId, 'bind_role_id' => $bindRoleId])->find(); - if ($existBind) { - throw new \Exception('该玩家角色已被绑定'); - } */ + $existBindCount = M('testing_binding', 'tab_')->where(['game_id' => ['in', $gameIds], 'bind_role_id' => $bindRoleId])->count(); + if ($existBindCount >= 2) { + throw new \Exception('同一游戏最多只能绑定两个角色'); + } - $testExistBind = M('testing_binding', 'tab_')->field(['id'])->where(['game_id' => $gameId, 'role_id' => $testingRoleId])->find(); + $testExistBind = M('testing_binding', 'tab_')->field(['id'])->where(['game_id' => ['in', $gameIds], 'role_id' => $testingRoleId])->find(); if ($testExistBind) { throw new \Exception('该测试账号角色已绑定有角色'); } From 98c938c8143fa2e4d716481c4cd912eb78deeecd Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 11 Jun 2021 14:00:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Tool/GameResource.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Base/Tool/GameResource.class.php b/Application/Base/Tool/GameResource.class.php index f267e6c53..46e4a3604 100644 --- a/Application/Base/Tool/GameResource.class.php +++ b/Application/Base/Tool/GameResource.class.php @@ -30,6 +30,8 @@ class GameResource 248 => LeyouClient::class, // 剑破长空(苹果版) 275 => LeyouClient::class, // 一梦仙境(安卓版) 276 => LeyouClient::class, // 一梦仙境(苹果版) + 280 => LeyouClient::class, // 万剑八荒(安卓版) + 281 => LeyouClient::class, // 万剑八荒(苹果版) ]; public function __construct($game) From 4e1cf805ea4dacdfa96623e53cef07d983b88703 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 11 Jun 2021 14:12:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/TestingResourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index 6015fdb2b..99bde3376 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -340,7 +340,7 @@ class TestingResourceService $existBindCount = M('testing_binding', 'tab_')->where(['game_id' => ['in', $gameIds], 'bind_role_id' => $bindRoleId])->count(); if ($existBindCount >= 2) { - throw new \Exception('同一游戏最多只能绑定两个角色'); + throw new \Exception('同一角色最多只能被绑定两次'); } $testExistBind = M('testing_binding', 'tab_')->field(['id'])->where(['game_id' => ['in', $gameIds], 'role_id' => $testingRoleId])->find();