接口调试、增加人脸识别后主副屏支付金额逻辑、其它优化

app/src/main/java/com/sw/dualscreen/network/api/ApiService.kt

@@ -6,6 +6,8 @@ import com.sw.dualscreen.model.response.ApiResponse
 import com.sw.dualscreen.model.response.DinnerType
 import com.sw.dualscreen.model.response.FoodInfo
 import com.sw.dualscreen.model.response.FoodSearchReq
+import com.sw.dualscreen.model.response.FoodOrder
+import com.sw.dualscreen.model.response.MemberInfo
 import com.sw.dualscreen.model.response.UserFaceModel
 import com.sw.dualscreen.model.response.UserNutritionData
 import com.sw.dualscreen.objbox.CollectedFoodInfo
@@ -71,7 +73,7 @@ interface ApiService {
     @POST
     suspend fun getCollectedFoodList(
         @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/dishPage",
-        @Body param: Map<String, Int>
+        @Body param: Map<String, String>
     ): ApiResponse<List<CollectedFoodInfo>>
 
 
@@ -108,7 +110,7 @@ interface ApiService {
     @GET
     suspend fun getDinnerType(
 //        @Url url: String = "${GlobalData.appBaseUrl}/zhstapi/zhst/getCanteenDinnerType",
-        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/getRegionRule",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/getRegionRule",
 //        @Query("appVersion") appVersion: String = GlobalData.appVersion,
 //        @Query("canteenId") restId: String,
     ): ApiResponse<DinnerType>
@@ -134,6 +136,34 @@ interface ApiService {
         @Body req: FoodSearchReq
     ): ApiResponse<List<FoodInfo>>
 
+    /**
+     * 开餐-生成订单
+     */
+    @POST
+    suspend fun createOrder(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/userEatFood/doubleScale",
+        @Body order: FoodOrder
+    ): ApiResponse<Any?>
+
+    /**
+     * APP根据id获取会员或员工信息及余额
+     */
+    @GET
+    suspend fun getMemberInfo(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/common/app/getUserInfoBalanceById",
+        @Query("id") memberId: String,
+    ): ApiResponse<MemberInfo?>
+
+    /**
+     * 绑定用户与订单号
+     */
+    @GET
+    suspend fun bindOrder(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/bingOrder",
+        @Query("userId") userId: String,
+        @Query("orderId") orderId: String
+    ): ApiResponse<Any?>
+
 
     /**
      * 提交采集图片数据