更新

app/api/controller/RemoteController.php

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

app/api/controller/TaskController.php

@@ -7,9 +7,11 @@ use app\common\model\informationg\UserInformationg;
 use app\common\model\task\Task;
 use app\common\model\user\User;
 
-class TaskController extends BaseApiController{
+class TaskController extends BaseApiController
+{
 
-    public function lists(){
+    public function lists()
+    {
         $param = Request()->param();
         [$page, $limit] = $this->getPage();
         if ($this->userInfo['admin_id'] != 0) {
@@ -46,10 +48,8 @@ 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'] = '';
                 }
@@ -58,20 +58,36 @@ class TaskController extends BaseApiController{
         return $this->success('ok', $res);
     }
 
-    public function informationg_list(){
+    //交易详情
+    public function order_detail()
+    {
+        $parmas = $this->request->param();
+        $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(); // 可能要判断预存金是否满足
+        $find = App(RemoteController::class)->shang_date_total_price($company);
+
+        $list = App(RemoteController::class)->shang_date_list($company,1,$parmas);
+        if ($find != false) {
+            $find['list']=$list;
+            return $this->success('ok', $find);
+        }
+        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,
+                    ->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 = [];
         }