|
|
@ -1514,7 +1514,7 @@ class MarketPercentageController extends ThinkController
|
|
|
|
$time_end = 99999999999;
|
|
|
|
$time_end = 99999999999;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$last_month = strtotime(date('Y-m-t',strtotime("-1 month")));
|
|
|
|
$last_month = strtotime(date('Y-m-t',strtotime("-2 month")));
|
|
|
|
|
|
|
|
|
|
|
|
if ($data['begin_time'] < $last_month) {
|
|
|
|
if ($data['begin_time'] < $last_month) {
|
|
|
|
$this->ajaxReturn(['msg'=>"已经结算过的时间不能添加","status"=>0]);
|
|
|
|
$this->ajaxReturn(['msg'=>"已经结算过的时间不能添加","status"=>0]);
|
|
|
@ -1587,7 +1587,7 @@ class MarketPercentageController extends ThinkController
|
|
|
|
$time_start = $company_belong_game_data['begin_time'];
|
|
|
|
$time_start = $company_belong_game_data['begin_time'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$last_month = strtotime(date('Y-m-t',strtotime("-1 month")));
|
|
|
|
$last_month = strtotime(date('Y-m-t',strtotime("-2 month")));
|
|
|
|
|
|
|
|
|
|
|
|
if ($company_belong_game_data['end_time'] > $last_month && $data['end_time'] < $last_month)
|
|
|
|
if ($company_belong_game_data['end_time'] > $last_month && $data['end_time'] < $last_month)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1640,7 +1640,7 @@ class MarketPercentageController extends ThinkController
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$data['is_start'] = 0;
|
|
|
|
$data['is_start'] = 0;
|
|
|
|
if($data['begin_time']<strtotime(date("Y-m-1",time()))) {
|
|
|
|
if($data['begin_time']<strtotime(date("Y-m-1",strtotime('-1 month')))) {
|
|
|
|
$data['is_start'] = 1;
|
|
|
|
$data['is_start'] = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|