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']}");
+ }
+
}
}
}
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 @@
+
+
+