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-22 15:05:16 +08:00
parent bdf7454e8f
commit 541bfe2f43
2 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class RemoteController extends BaseApiController
} }
} }
public function shang_date_list($company,$is_day=1){ public function shang_date_list($company,$is_day,$querys){
if($is_day==1){ if($is_day==1){
$yesterday = date('Y-m-d'); $yesterday = date('Y-m-d');
}else{ }else{
@ -131,6 +131,9 @@ class RemoteController extends BaseApiController
return false; return false;
} }
if(isset($querys['page'])){
$parmas['page']=$querys['page'];
}
try{ try{
$list = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/region/order', [ $list = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/region/order', [
'query' => $parmas, 'query' => $parmas,

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

@ -7,74 +7,90 @@ use app\common\model\informationg\UserInformationg;
use app\common\model\task\Task; use app\common\model\task\Task;
use app\common\model\user\User; use app\common\model\user\User;
class TaskController extends BaseApiController{ class TaskController extends BaseApiController
{
public function lists(){ public function lists()
{
$param = Request()->param(); $param = Request()->param();
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
if($this->userInfo['admin_id']!=0){ if ($this->userInfo['admin_id'] != 0) {
$where[]=['company_id','=',$this->userInfo['company_id']]; $where[] = ['company_id', '=', $this->userInfo['company_id']];
}else{ } else {
$is_captain=User::where('id',$this->userId)->value('is_captain'); $is_captain = User::where('id', $this->userId)->value('is_captain');
if($is_captain==1){ if ($is_captain == 1) {
$where[]=['type','=',31]; $where[] = ['type', '=', 31];
}else{ } else {
$where[]=['director_uid','=',$this->userId]; $where[] = ['director_uid', '=', $this->userId];
} }
$where[]=['company_id','=',$this->userInfo['company_id']]; $where[] = ['company_id', '=', $this->userInfo['company_id']];
// $where[]=['status','in',[1,2,3,5]]; // $where[]=['status','in',[1,2,3,5]];
} }
if(isset($param['date_time']) && $param['date_time']!=''){ if (isset($param['date_time']) && $param['date_time'] != '') {
$time=strtotime($param['date_time']); $time = strtotime($param['date_time']);
$end=$time+86399; $end = $time + 86399;
$where[]=['start_time','between',[$time,$end]]; $where[] = ['start_time', 'between', [$time, $end]];
}else{ } else {
$time=strtotime(date('Y-m-d')); $time = strtotime(date('Y-m-d'));
$end=$time+86399; $end = $time + 86399;
$where[]=['start_time','between',[$time,$end]]; $where[] = ['start_time', 'between', [$time, $end]];
} }
if(isset($param['status']) && $param['status']>0){ if (isset($param['status']) && $param['status'] > 0) {
$where[]=['status','=',$param['status']]; $where[] = ['status', '=', $param['status']];
} }
$res=Task::where($where) $res = Task::where($where)
->field(['id', 'title','money','template_id','director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend']) ->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content', 'extend'])
->page($page,25) ->page($page, 25)
->order(['id' => 'desc','status'=>'asc']) ->order(['id' => 'desc', 'status' => 'asc'])
->select()->toArray(); ->select()->toArray();
foreach($res as $k=>$item){ foreach ($res as $k => $item) {
if($item['type']==33){ 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')->find(); // 可能要判断预存金是否满足 $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
$find=App(RemoteController::class)->shang_date_total_price($company); $find = App(RemoteController::class)->shang_date_total_price($company);
$list=App(RemoteController::class)->shang_date_list($company); if ($find != false) {
if($find!=false){ $res[$k]['extend']['transaction'] = $find;
$res[$k]['extend']['transaction']=$find; } else {
$res[$k]['extend']['transaction']['list']=$list; $res[$k]['extend']['transaction'] = '';
}else{
$res[$k]['extend']['transaction']='';
} }
} }
} }
return $this->success('ok', $res); return $this->success('ok', $res);
} }
public function informationg_list(){ //交易详情
$parmas=Request()->param(); public function order_detail()
$find=Task::where('id',$parmas['id'])->find(); {
if($find['type']==31){ $parmas = $this->request->param();
if(isset($find['extend']['informationg']['ids'])){ $company = Company::where('id', $parmas['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
$ids=$find['extend']['informationg']['ids']; $find = App(RemoteController::class)->shang_date_total_price($company);
$list= UserInformationg::where('id','in',$ids)
->field('id,name,phone,sex,age,update_time,
area_id,area_id area_name,street_id,street_id street_name,village_id,village_id village_name,brigade_id,brigade_id brigade_name,address'
)->select()->toArray();
}else{
$list=[];
}
}else{ $list = App(RemoteController::class)->shang_date_list($company,1,$parmas);
$list=[]; if ($find != false) {
$find['list']=$list;
return $this->success('ok', $find);
} }
return $this->success('ok',$list); return $this->success('ok');
} }
}
public function informationg_list()
{
$parmas = Request()->param();
$find = Task::where('id', $parmas['id'])->find();
if ($find['type'] == 31) {
if (isset($find['extend']['informationg']['ids'])) {
$ids = $find['extend']['informationg']['ids'];
$list = UserInformationg::where('id', 'in', $ids)
->field(
'id,name,phone,sex,age,update_time,
area_id,area_id area_name,street_id,street_id street_name,village_id,village_id village_name,brigade_id,brigade_id brigade_name,address'
)->select()->toArray();
} else {
$list = [];
}
} else {
$list = [];
}
return $this->success('ok', $list);
}
}