|
|
@@ -435,14 +435,15 @@ class LiveService extends BaseService
|
|
|
}
|
|
|
if($this->model->where(['id'=> $id,'mark'=>1])->update($updateData)){
|
|
|
$this->error = 1002;
|
|
|
- $time = $info['end_time']? intval($info['end_time'] - $info['create_time']) : intval(time() - $info['create_time']);
|
|
|
+ $createTime = $info['create_time']? strtotime($info['create_time']) : time();
|
|
|
+ $time = $info['end_time']? intval($info['end_time'] - $createTime) : intval(time() - $createTime);
|
|
|
$info['status'] = $status;
|
|
|
$info['live_hour'] = $time > 3600 ? intval($time/3600) : 0;
|
|
|
$info['live_minute'] = $time%3600? intval($time%3600/60) : 0;
|
|
|
- $info['time_text'] = date('H:i', $info['create_time']);
|
|
|
+ $info['time_text'] = date('H:i', $createTime);
|
|
|
$info['end_time_text'] = date('H:i', $info['end_time']? $info['end_time'] : time());
|
|
|
$info['fans_num'] = MemberCollectService::make()->getViewFansCountByType($info['user_id'], $id, 2);
|
|
|
- $info['new_fans'] = MemberCollectService::make()->getNewFansCount($info['user_id'], $id,2, $info['create_time']);
|
|
|
+ $info['new_fans'] = MemberCollectService::make()->getNewFansCount($info['user_id'], $id,2, $createTime);
|
|
|
return $info;
|
|
|
}
|
|
|
|