Merge branch '20241029_fl_order'

app/Controller/OrderController.php

@@ -26,11 +26,6 @@ class OrderController extends AbstractController
      */
     #[Inject]
     private $orderServiceClient;
-    public function index(RequestInterface $request, ResponseInterface $response)
-    {
-        return $response->raw('Hello Hyperf!');
-    }
-
     /***
      * 状态说明
      */
@@ -40,57 +35,61 @@ class OrderController extends AbstractController
         $data['order'] = [
             1 => '已通过',
             2 => '已驳回',
-            3 => '已撤回',
-            4 => '已修改',
+            3 => '已取消',
             5 => '已过期',
             6 => '待审核',
-            7 => '已结束'
+            7 => '已完成'
         ];
         $data['order_ad'] = [
             1 => '待投放',
-            2 => '已驳回',
-            3 => '已撤回',
-            4 => '已修改',
-            5 => '已过期',
+            2 => '已失效',
+            3 => '已失效',
+            5 => '待审核',
             6 => '待审核',
-            7 => '已结束',
+            7 => '已失效',
             8 => '投放中'
         ];
-
+        $data['check'] = [
+            1 => '已通过',
+            2 => '已驳回',
+            6 => '待审核',
+           
+        ];        
         return Result::success($data);
-
     }
     /**
-     * 查询广告位
+     * 获取广告尺寸及查询广告位
      */
     public function getAD()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'width' => 'required',
-                'height' => 'required',
-                'starttime' => 'required',
-                'endtime' => 'required',
-                'pageSize' => 'required',
-                'page' => 'required',
-
-            ],
-            [
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
-                'starttime.required' => '广告开始时间不能为空',
-                'endtime.required' => '广告结束时间不能为空',
-                'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空',
-
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        if(!empty($requireData)){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'ad_size_id' => 'required',
+                    'starttime' => 'required',
+                    'endtime' => 'required',
+                    'pageSize' => 'required',
+                    'page' => 'required',
+    
+                ],
+                [
+                    'ad_size_id.required' => '广告尺寸id不能为空',
+                    'starttime.required' => '广告开始时间不能为空',
+                    'endtime.required' => '广告结束时间不能为空',
+                    'pageSize.required' => '显示条数不能为空',
+                    'page.required' => '分页不能为空',
+    
+                ]
+            );
+            if ($validator->fails()) {
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
         }
+        
+        
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -104,34 +103,28 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'width' => 'required',
-                'height' => 'required',
+                'ad_size_id' => 'required',
                 'starttime' => 'required',
                 'endtime' => 'required',
-
+                'pageSize' => 'required',
+                'page' => 'required',
             ],
             [
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
+                'ad_size_id.required' => '广告尺寸id不能为空',
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
-
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空'
             ]
         );
         if (!empty($requireData['website_id'])) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'website_id' => 'required',
-                    'pageSize' => 'required',
-                    'page' => 'required',
-
+                    'website_id' => 'required'
                 ],
                 [
-                    'website_id.required' => '网站id不能为空',
-                    'pageSize.required' => '显示条数不能为空',
-                    'page.required' => '分页不能为空',
-
+                    'website_id.required' => '网站id不能为空'
                 ]
             );
         }
@@ -167,6 +160,31 @@ class OrderController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+     /**
+     * 获取广告订单价格
+     */
+    public function getPrice(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+        $requireData,
+            [
+                'starttime' => 'required',
+                'endtime' => 'required',
+            ],
+            [
+                'starttime.required' => '广告开始时间不能为空',
+                'endtime.required' => '广告结束时间不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // var_dump($requireData);
+        $result = $this->orderServiceClient->getPrice($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    
     /**
      * 添加订单
      */
@@ -178,24 +196,23 @@ class OrderController extends AbstractController
             [
 
                 'name' => 'required',
-                'width' => 'required',
-                'height' => 'required',
+                'ad_size_id' => 'required',
                 'starttime' => 'required',
                 'endtime' => 'required',
                 'imgurl' => 'required',
                 'imgsrc' => 'required',
                 'pid' => 'required',
+                'price' =>'required'
             ],
             [
                 'name.required' => '广告名称不能为空',
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
+                'ad_size_id.required' => '广告图片尺寸id不能为空',
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
                 'imgurl.required' => '图片广告链接不能为空',
                 'imgsrc.required' => '图片广告地址不能为空',
                 'pid.required' => '广告位id不能为空',
-
+                'price.required' => '价格不能为空'
             ]
         );
 
@@ -204,9 +221,6 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
-        $commaSeparatedString = $requireData['pid'];
-        $array = explode(",", $commaSeparatedString);
-        $requireData['pid'] = $array;
         $result = $this->orderServiceClient->addAD($requireData);
         // return $requireData;
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);

app/JsonRpc/OrderService.php

@@ -16,7 +16,7 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
      * @var string
      */
     protected string $protocol = 'jsonrpc-http';
-
+   
     /**
      * @param array $data
      * @return mixed
@@ -66,6 +66,15 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
         return $this->__request(__FUNCTION__, $data);
     }
 
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getPrice(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/OrderServiceInterface.php

@@ -4,6 +4,7 @@ namespace App\JsonRpc;
 
 interface OrderServiceInterface
 {
+   
     /**
      * @param array $data
      */
@@ -41,6 +42,11 @@ interface OrderServiceInterface
      */
     public function delOrderAdmin(array $data);
 
+    /**
+     * @param array $data
+     */
+    public function getPrice(array $data);
+    
     /**
      * @param array $data
      */

config/api/order.php

@@ -8,14 +8,18 @@ use Hyperf\HttpServer\Router\Router;
 Router::addGroup(
     '/order', function () {
         //订单状态对应
-        Router::get('/getStauts', [OrderController::class, 'getStauts']);
-        
+        Router::get('/getStatus', [OrderController::class, 'getStatus']);
         //查询广告
         Router::post('/getAD', [OrderController::class, 'getAD']);
         //根据网站搜索广告
         Router::post('/getWebsiteAd', [OrderController::class, 'getWebsiteAd']);
+
+        //获取订单金额
+        Router::post('/getPrice', [OrderController::class, 'getPrice']);
+
         //添加订单
         Router::post('/addAD', [OrderController::class, 'addAD']);
+
         //获取订单列表
         Router::get('/getOrderList', [OrderController::class, 'getOrderList']);
         //获取订单详情