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-09-08 10:25:10 +08:00
parent dadab9f08e
commit 849119e15c
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/controller/RemoteController.php
View File

@ -12,17 +12,12 @@ class RemoteController extends BaseApiController
public array $notNeedLogin = ['index'];
public function shang_date_total_price($company,$isDay=1,$arr=[],$template_id=0)
public function shang_date_total_price($company,$arr=[],$template_id=0)
{
if($isDay==1){
$start_time = date('Y-m-d');
$time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time);
}else{
$start_time = date('Y-m-d',strtotime('-1 day', time()));
$time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time);
}
$start_time = date('Y-m-d');
$time=strtotime($start_time)+86399;
$end_time=date('Y-m-d H:i:s',$time);
if(isset($arr['start_time']) && $arr['end_time']){
$start_time = $arr['start_time'];
$end_time = $arr['end_time'];

17
app/api/controller/TaskController.php
View File

@ -45,7 +45,6 @@ class TaskController extends BaseApiController
$param['end_time']=date('Y-m-d H:i:s',$end);
$where[] = ['start_time', 'between', [$time, $end]];
}
}
if (isset($param['status']) && $param['status'] > 0) {
$where[] = ['status', '=', $param['status']];
@ -58,15 +57,17 @@ class TaskController extends BaseApiController
foreach ($res as $k => $item) {
if ($item['type'] == 33) {
$company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足
$find = App(RemoteController::class)->shang_date_total_price($company,1,$param,$item['template_id']);
$find = App(RemoteController::class)->shang_date_total_price($company,$param,$item['template_id']);
if ($find != false) {
$transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
if($transaction_pool==0){
$find['transaction_pool']=0;
}else{
$find['transaction_pool']=$transaction_pool;
if($time<time()){
$transaction_pool=TaskTemplate::where('id',$item['template_id'])->value('transaction_pool');
if($transaction_pool==0){
$find['transaction_pool']=0;
}else{
$find['transaction_pool']=$transaction_pool;
}
$res[$k]['extend']['transaction'] = $find;
}
$res[$k]['extend']['transaction'] = $find;
// Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]);
} else {
$res[$k]['extend']['transaction'] = '';