From 6e7eb8071570c22830deaf95f7e8b89aed1cc67d Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Mon, 26 Jan 2026 15:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sw/dualscreen/network/api/ApiService.kt | 26 +++++++++++++------ .../dualscreen/repository/RemoteRepository.kt | 10 ++++--- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt b/app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt index 437c882..f8a186b 100644 --- a/app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt +++ b/app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt @@ -91,19 +91,29 @@ interface ApiService { ): ApiResponse> +// /** +// * 获取档口菜品信息 +// */ +// @GET +// suspend fun getRestInfoFoodsByType( +//// @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall", +//// @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNamePage", +// @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNameList", +// @Query("name") foodName: String, +//// @Query("appVersion") appVersion: String = GlobalData.appVersion, +//// @Query("restId") restId: String, +//// @Query("type") type: Int, +//// @Query("foodName") foodName: String, +// ): ApiResponse> + + /** * 获取档口菜品信息 */ - @GET + @POST suspend fun getRestInfoFoodsByType( -// @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getRestInfoFoodsByType/stall", -// @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNamePage", @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getFoodsByFoodNameList", - @Query("name") foodName: String, -// @Query("appVersion") appVersion: String = GlobalData.appVersion, -// @Query("restId") restId: String, -// @Query("type") type: Int, -// @Query("foodName") foodName: String, + @Body param: HashMap ): ApiResponse> // /** diff --git a/app/src/main/java/com/sw/dualscreen/repository/RemoteRepository.kt b/app/src/main/java/com/sw/dualscreen/repository/RemoteRepository.kt index 2a0fb6f..8d34d1d 100644 --- a/app/src/main/java/com/sw/dualscreen/repository/RemoteRepository.kt +++ b/app/src/main/java/com/sw/dualscreen/repository/RemoteRepository.kt @@ -131,12 +131,16 @@ class RemoteRepository constructor( * @param type 0全部 1餐次 */ suspend fun getRestInfoFoodsByType( - restId: String = GlobalData.restId, - type: Int = 0, foodName: String, + pageNum: Int = 1, + pageSize:Int = 100 ): ApiResponse> { return safeApiCall { - apiService.getRestInfoFoodsByType(foodName = foodName) + apiService.getRestInfoFoodsByType(param = hashMapOf( + "name" to foodName, + "pageNum" to "$pageNum", + "pageSize" to "$pageSize" + )) } }