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

app/Controller/OrderController.php

@@ -286,7 +286,8 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $result = $this->orderServiceClient->getOrderListAdmin($requireData);
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->orderServiceClient->cancelOrder($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
 
     }