更新

app/api/controller/CeshiController.php

@@ -41,6 +41,7 @@ class CeshiController extends BaseApiController
         }
     }
 
+    //三轮车判断
     public function ceshi1(){
         $params=[
             'car_id'=>3,
@@ -64,6 +65,8 @@ class CeshiController extends BaseApiController
     }
 
     public function ceshi2(){
+        $
+        $b=app(RemoteController::class)->shang_date_list('');
 
     }
 

app/api/controller/RemoteController.php

@@ -13,7 +13,6 @@ class RemoteController extends BaseApiController
 
     public function shang_date_total_price($company,$is_day=1)
     {
-        //strtotime('-1 day', time())
         if($is_day==1){
             $yesterday = date('Y-m-d');
         }else{
@@ -57,7 +56,6 @@ class RemoteController extends BaseApiController
             $res = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/order/statistics', [
                 'query' => $parmas,
             ]);
-
             $json = json_decode($res->getContent(), true);
             $arr['total_price'] = 0;
             $arr['status'] = 0;
@@ -93,6 +91,63 @@ class RemoteController extends BaseApiController
         }
     }
 
+    public function shang_date_list($company,$is_day=1){
+        if($is_day==1){
+            $yesterday = date('Y-m-d');
+        }else{
+            $yesterday = date('Y-m-d',strtotime('-1 day', time()));
+        }
+        $parmas = [
+            "start_date" => $yesterday,
+            "end_date" => $yesterday
+        ];
+        switch ($company['company_type']) {
+            case 18:
+                $parmas['brigade_id'] = $company['brigade'];
+                $parmas['village_code'] = $company['village'];
+                $parmas['street_code'] = $company['street'];
+                $parmas['district_code'] = $company['area'];
+                $parmas['city_code'] = $company['city'];
+                break;
+            case 17:
+                $parmas['village_code'] = $company['village'];
+                $parmas['street_code'] = $company['street'];
+                $parmas['district_code'] = $company['area'];
+                $parmas['city_code'] = $company['city'];
+                break;
+            case 16:
+                $parmas['street_code'] = $company['street'];
+                $parmas['district_code'] = $company['area'];
+                $parmas['city_code'] = $company['city'];
+                break;
+            case 15:
+                $parmas['district_code'] = $company['area'];
+                $parmas['city_code'] = $company['city'];
+                break;
+            case 14:
+                $parmas['city_code'] = $company['city'];
+                break;
+            default:
+                return false;
+        }
+
+        try{
+            $list = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/region/order', [
+                'query' => $parmas,
+            ]);
+    
+            $json_list = json_decode($list->getContent(), true);
+            $data=[];
+            if($json_list['status'] == 200){
+               $data=$json_list['data']['list']; 
+            }
+            return $data;
+        }catch(\Exception $e){
+            return false;
+        }
+
+    }
+
     /**
      * 
      * 获取坐标的距离

app/api/controller/TaskController.php

@@ -46,8 +46,10 @@ class TaskController extends BaseApiController{
             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(); // 可能要判断预存金是否满足
                 $find=App(RemoteController::class)->shang_date_total_price($company);
+                $list=App(RemoteController::class)->shang_date_list($company);
                 if($find!=false){
                     $res[$k]['extend']['transaction']=$find;
+                    $res[$k]['extend']['transaction']['list']=$list;
                 }else{
                     $res[$k]['extend']['transaction']='';
                 }