Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/OrderController.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Controller;
 
@@ -29,7 +29,7 @@ class OrderController extends AbstractController
     /***
      * 状态说明
      */
-    
+
     public function getStatus()
     {
         $data['order'] = [
@@ -53,8 +53,8 @@ class OrderController extends AbstractController
             1 => '已通过',
             2 => '已驳回',
             6 => '待审核',
-           
-        ];        
+
+        ];
         return Result::success($data);
     }
     /**
@@ -62,7 +62,7 @@ class OrderController extends AbstractController
      */
     public function getAD()
     {
-        $requireData['website_id'] = Context::get("SiteId")??'2';
+        $requireData['website_id'] = Context::get("SiteId") ?? '2';
         // return Result::success($requireData);
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -80,8 +80,8 @@ class OrderController extends AbstractController
                 'ad_size_id' => 'required|integer',
                 'starttime' => 'required',
                 'endtime' => 'required',
-                'pageSize' =>'required|integer',
-                'page' =>'required|integer'
+                'pageSize' => 'required|integer',
+                'page' => 'required|integer'
             ],
             [
                 'ad_size_id.required' => '广告尺寸id不能为空',
@@ -98,7 +98,7 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = Context::get("SiteId") ??'2';
+        $requireData['website_id'] = Context::get("SiteId") ?? '2';
         $result = $this->orderServiceClient->getWebsiteAd($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -122,17 +122,21 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['user_id'] = Context::get('UserId');
+        $requireData['website_id'] = Context::get("SiteId");
+        $requireData['type_id'] = Context::get("TypeId");
         $result = $this->orderServiceClient->getOrderListAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
-     /**
+    /**
      * 获取广告订单价格
      */
-    public function getPrice(){
+    public function getPrice()
+    {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
-        $requireData,
+            $requireData,
             [
                 'starttime' => 'required',
                 'endtime' => 'required',
@@ -150,7 +154,7 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getPrice($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    
+
     /**
      * 添加订单
      */
@@ -168,7 +172,7 @@ class OrderController extends AbstractController
                 'imgurl' => 'required',
                 'imgsrc' => 'required',
                 'pid' => 'required',
-                'price' =>'required'
+                'price' => 'required'
             ],
             [
                 'name.required' => '广告名称不能为空',
@@ -282,7 +286,6 @@ class OrderController extends AbstractController
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->cancelOrder($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-
     }
     // 获取订单详情
     public function getOrderDetailAdmin()
@@ -398,7 +401,6 @@ class OrderController extends AbstractController
         }
         $result = $this->orderServiceClient->rejectOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-
     }
     public function endOrderAdmin()
     {
@@ -467,8 +469,8 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'shopping_id' =>'required|integer',
-                'pid' =>'required|integer'
+                'shopping_id' => 'required|integer',
+                'pid' => 'required|integer'
             ],
             [
                 'shopping_id.required' => '购物订单id不能为空',
@@ -483,7 +485,7 @@ class OrderController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->addShoppingCartAD($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 用户获取购物车中的广告位
@@ -494,47 +496,47 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'shopping_id' =>'required|integer'
-            ], 
+                'shopping_id' => 'required|integer'
+            ],
             [
-               'shopping_id.required' => '购物订单id不能为空',
-               'shopping_id.integer' => '购物订单id格式不正确'
+                'shopping_id.required' => '购物订单id不能为空',
+                'shopping_id.integer' => '购物订单id格式不正确'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage); 
+            return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->getShoppingCartAD($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 用户删除购物车中的广告位
-    */
+     */
     public function delShoppingCartAD()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'shopping_id' =>'required|integer',
-                'pid' =>'required|integer'
+                'shopping_id' => 'required|integer',
+                'pid' => 'required|integer'
             ],
             [
                 'shopping_id.required' => '购物订单id不能为空',
                 'shopping_id.integer' => '购物订单id格式不正确',
                 'pid.required' => '广告位id不能为空',
-                'pid.integer' => '广告位id格式不正确', 
-            ] 
+                'pid.integer' => '广告位id格式不正确',
+            ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage); 
-        } 
+            return Result::error($errorMessage);
+        }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->delShoppingCartAD($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /*
      * 获取广告位的尺寸
@@ -544,6 +546,6 @@ class OrderController extends AbstractController
     {
         // $data = [];
         $result = $this->orderServiceClient->getAdSize();
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }