mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-16 11:44:04 +08:00
parent ff1bbc4733
commit 389847b078
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/lists/AccountLogLists.php
View File

@ -111,11 +111,11 @@ class AccountLogLists extends BaseApiDataLists
// 变动时间 // 变动时间
if (!empty($this->params['time'])) { if (!empty($this->params['time'])) {
$date = strtotime($this->params['time']); $date = strtotime($this->params['time']);
$startTime = $date - 3600; // 获取该日期零点的时间戳 $startTime = $date; // 获取该日期零点的时间戳
$endTime = $date + 86400; // 获取该日期24小时后的时间戳 $endTime = $date + 86399; // 获取该日期24小时后的时间戳
$where[] = ['create_time', 'between time', [$startTime, $endTime]]; $where[] = ['create_time', 'between time', [$startTime, $endTime]];
}else{ }else{
$where[] = ['create_time', 'between time', [strtotime(date('Y-m-d')), strtotime(date('Y-m-d'))+86400]]; $where[] = ['create_time', 'between time', [strtotime(date('Y-m-d')), strtotime(date('Y-m-d'))+86366]];
} }
$lists = UserAccountLog::field($field) $lists = UserAccountLog::field($field)
->where($where) ->where($where)

2
app/common/model/task_scheduling_plan/TaskSchedulingPlan.php
View File

@ -48,7 +48,7 @@ class TaskSchedulingPlan extends BaseModel
} }
public function templateInfo() public function templateInfo()
{ {
return $this->hasOne(TaskTemplate::class, 'id', 'template_id')->where('status',1); return $this->hasOne(TaskTemplate::class, 'id', 'template_id');
} }
public function company() public function company()
{ {

22
app/job/TaskInformationJob.php
View File

@ -24,26 +24,14 @@ class TaskInformationJob
$arr['status'] = 0; $arr['status'] = 0;
//信息更新 //信息更新
if ($data['template_info']['type'] == 31) { if ($data['template_info']['type'] == 31) {
$task_id = explode(',', $data['task_id']); if($data['template_info']['information_count'] < $data['template_info']['information_day_count']){
$task_count = Task::where('id', 'in', $task_id)->field('director_uid')->with('director_info')->select(); Log::info('任务结算失败，信息更新未达到要求：' . json_encode($data));
if (empty($task_count)) {
Log::error('列30 任务结算失败，task_count为空：' . json_encode($data));
return false;
}
if (count($task_count) == count($task_id)) {
$name_arr = [];
foreach ($task_count as $key => $value) {
$name_arr[$key] = $value['director_info']['nickname'];
}
$name = implode('、', $name_arr);
$arr['status'] = 1;
} else {
Log::error('列41 任务结算失败，任务id：' . json_encode($data));
return false; return false;
} }
$name = '小组队长';
} elseif } elseif
//交易金额 //交易金额
($data['template_info']['type'] == 32) { ($data['template_info']['type'] == 33) {
$yesterday = date('Y-m-d', strtotime('-1 day', time())); $yesterday = date('Y-m-d', strtotime('-1 day', time()));
$parmas = [ $parmas = [
"start_date" => $yesterday, "start_date" => $yesterday,
@ -88,7 +76,7 @@ class TaskInformationJob
$name = '片区交易'; $name = '片区交易';
if ($json['status'] == 200) { if ($json['status'] == 200) {
$arr['total_price'] = $json['data']['total_price']; $arr['total_price'] = $json['data']['total_price'];
if ($json['data']['total_price'] > 100) { if ($json['data']['total_price'] > 58*5) {
$arr['status'] = 1; $arr['status'] = 1;
$name = '片区交易'; $name = '片区交易';
} }