Merge branch '20241029_fl_order'

app/Controller/OrderController.php

@@ -466,4 +466,95 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->delOrderAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+
+    /**
+     * 用户创建购物车
+     */
+    public function addShoppingCart()
+    {
+        // return Result::success('ok');
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->orderServiceClient->addShoppingCart($requireData);
+        // Result::success($result['data']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 用户添加购物车中的广告位
+     */
+    public function addShoppingCartAD()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'shopping_id' =>'required|integer',
+                'pid' =>'required|integer'
+            ],
+            [
+                'shopping_id.required' => '购物订单id不能为空',
+                'shopping_id.integer' => '购物订单id格式不正确',
+                'pid.required' => '广告位id不能为空',
+                'pid.integer' => '广告位id格式不正确'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->orderServiceClient->addShoppingCartAD($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 用户获取购物车中的广告位
+     */
+    public function getShoppingCartAD()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'shopping_id' =>'required|integer'
+            ], 
+            [
+               'shopping_id.required' => '购物订单id不能为空',
+               'shopping_id.integer' => '购物订单id格式不正确'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            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']);
+    }
+    /**
+     * 用户删除购物车中的广告位
+    */
+    public function delShoppingCartAD()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'shopping_id' =>'required|integer',
+                'pid' =>'required|integer'
+            ],
+            [
+                'shopping_id.required' => '购物订单id不能为空',
+                'shopping_id.integer' => '购物订单id格式不正确',
+                'pid.required' => '广告位id不能为空',
+                'pid.integer' => '广告位id格式不正确', 
+            ] 
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            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']);
+    }
 }

app/JsonRpc/OrderService.php

@@ -65,7 +65,6 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
      /**
      * @param array $data
      * @return mixed
@@ -74,7 +73,6 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    
     /**
      * @param array $data
      * @return mixed
@@ -116,4 +114,37 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
         return $this->__request(__FUNCTION__, $data);
     }
 
+    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addShoppingCart(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getShoppingCartAD(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addShoppingCartAD(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delShoppingCartAD(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/OrderServiceInterface.php

@@ -68,4 +68,21 @@ interface OrderServiceInterface
      */
     public function delOrderAD(array $data);
 
+    
+    /**
+     * @param array $data
+     */
+    public function addShoppingCart(array $data);
+    /**
+     * @param array $data
+     */
+    public function getShoppingCartAD(array $data);
+    /**
+     * @param array $data
+     */
+    public function addShoppingCartAD(array $data);
+    /**
+     * @param array $data
+     */
+    public function delShoppingCartAD(array $data);
 }

config/api/order.php

@@ -49,13 +49,21 @@ Router::addGroup(
         Router::post('/getADList', [OrderController::class, 'getADList']);
         //获取广告详情
         Router::post('/getADDetail', [OrderController::class, 'getADDetail']);
-        //添加广告
-        Router::post('/addADAdmin', [OrderController::class, 'addAD']);
         //修改广告
         Router::post('/editAD', [OrderController::class, 'editAD']);
         //删除广告
         Router::post('/delAD', [OrderController::class, 'delAD']);
 
+        //创建购物车
+        Router::post('/addShoppingCart', [OrderController::class, 'addShoppingCart']);
+        //获取购物车中的广告位
+        Router::post('/getShoppingCartAD', [OrderController::class, 'getShoppingCartAD']);
+        //添加购物车中的广告位
+        Router::post('/addShoppingCartAD', [OrderController::class, 'addShoppingCartAD']);
+        //删除购物车中的广告位
+        Router::post('/delShoppingCartAD', [OrderController::class, 'delShoppingCartAD']);
+
+
     },
     ['middleware' => [FooMiddleware::class]]
 );