Merge branch '20241029_fl_order' of https://gitee.com/zxt_5/admin_consumer into 20241029_fl_order

app/Controller/AbstractController.php

@@ -31,7 +31,7 @@ abstract class AbstractController
 
     #[Inject]
     protected ResponseInterface $response;
-
+    
     /**
      * @var LoggerInterface
      */

app/Controller/OrderController.php

@@ -10,8 +10,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-
-/**
+use Hyperf\Context\Context;
 
 /**
  * Class OrderController
@@ -31,13 +30,25 @@ class OrderController extends AbstractController
     {
         return $response->raw('Hello Hyperf!');
     }
+ 
+    /***
+     * 状态说明
+     */
     public function getStauts()
     {
-
+        $data = [
+            1 => '通过',
+            2 => '驳回',
+            3 => '撤回',
+            4 => '修改',
+            5 => '过期',
+            6 => '待审核'
+        ];
+        return Result::success($data);
+ 
     }
-
     /**
-     * 查询广告
+     * 查询广告位
      */
     public function getAD()
     {
@@ -45,11 +56,21 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' => 'required',
+                'width' => 'required',
+                'height' => 'required',
+                'starttime' => 'required',
+                'endtime' => 'required',
+                'pageSize' => 'required',
+                'page' => 'required'
 
             ],
             [
-                'id.required' => 'id不能为空',
+                'width.required' => '图片宽度不能为空',
+                'height.required' => '图片高度不能为空',
+                'starttime.required' => '广告开始时间不能为空',
+                'endtime.required' => '广告结束时间不能为空',
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空'
 
             ]
         );
@@ -60,48 +81,182 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    public function getOrderListAdmin()
+ 
+    public function getOrderListAdmin(){}
+ 
+     /**
+     * 添加订单
+     */
+    public function addAD()
+ 
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'page' => 'required',
-                'pagesize' => 'required',
+ 
+                'name' => 'required',
+                'width' => 'required',
+                'height' => 'required',
+                'starttime' => 'required',
+                'endtime' => 'required',
+                'imgurl' => 'required',
+                'imgsrc' => 'required',
+                'pid' => 'required'
+            ],
+            [
+                'name.required' => '广告名称不能为空',
+                'width.required' => '图片宽度不能为空',
+                'height.required' => '图片高度不能为空',
+                'starttime.required' => '广告开始时间不能为空',
+                'endtime.required' => '广告结束时间不能为空',
+                'imgurl.required' => '图片广告链接不能为空',
+                'imgsrc.required' => '图片广告地址不能为空',
+                'pid.required' => '广告位id不能为空'
 
+            ]
+        );
+        
+        
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            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']);
+    }
+    /**
+     * 获取订单列表
+     */
+    public function getOrderList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pageSize' => 'required',
+                'page' => 'required'
+            ],
+            [
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空'
+            ]
+        );
+        if(isset($requireData['status'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'status' => 'required'
+                ],
+                [
+                    'status.required' => '状态不能为空'
+                ]
+            );
+        }
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] =Context::get("UserId");
+        $result = $this->orderServiceClient->getOrderList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取订单详情
+     */
+    public function getOrderDetail()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'order_id' => 'required',
+                'pageSize' => 'required',
+                'page' => 'required'
             ],
             [
-                'page.required' => 'page不能为空',
-                'pagesize.required' => 'pagesize不能为空',
+                'name.required' => '订单id不能为空',
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空'
 
             ]
         );
+        
+        
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] =Context::get("UserId");
+        $result = $this->orderServiceClient->getOrderDetail($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /***
+     * 撤回订单
+     */
+    public function cancelOrder()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'order_id' => 'required',
+            ],
+            [
+                'name.required' => '订单id不能为空'
+            ]
+        );
+ 
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+ 
         $result = $this->orderServiceClient->getOrderListAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
 
     }
     public function getOrderDetailAdmin()
+ 
+        $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 delOrderAD()
+ 
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
+ 
                 'id' => 'required',
 
             ],
             [
                 'id.required' => 'id不能为空',
 
+ 
+                'order_id' => 'required',
+            ],
+            [
+                'name.required' => '订单id不能为空'
+ 
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+ 
         $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -214,6 +369,10 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->orderServiceClient->delOrderAdmin($requireData);
+ 
+        $requireData['user_id'] =Context::get("UserId");
+        $result = $this->orderServiceClient->delOrderAD($requireData);
+ 
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

app/JsonRpc/OrderService.php

@@ -59,4 +59,45 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
         return $this->__request(__FUNCTION__, $data);
     }
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addAD(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOrderList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOrderDetail(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function cancelOrder(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delOrderAD(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 }

app/JsonRpc/OrderServiceInterface.php

@@ -38,4 +38,25 @@ interface OrderServiceInterface
      */
     public function delOrderAdmin(array $data);
 
+    /**
+     * @param array $data
+     */
+    public function addAD(array $data);
+    /**
+     * @param array $data
+     */
+    public function getOrderList(array $data);
+    /**
+     * @param array $data
+     */
+    public function getOrderDetail(array $data);
+    /**
+     * @param array $data
+     */
+    public function cancelOrder(array $data);
+    /**
+     * @param array $data
+     */
+    public function delOrderAD(array $data);
+
 }