营养接口调试、支付接口联调

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

@@ -123,17 +123,6 @@ interface ApiService {
         @Query("id") userId: String
     ): ApiResponse<UserNutrition>
 
-    /**
-     * 获取支付二维码
-     */
-    @GET
-    suspend fun getQrCodeImg(
-        @Url url: String = "${GlobalData.appBaseUrl}/pay/yx-check-out-pay/getQrCodeImg",
-        @Query("orderNo") orderNo: String,
-        @Query("memberId") memberId: String?,
-        @Query("totalFee") totalFee: String?
-    ): ApiResponse<String?>
-
     /**
      * 获取当前餐点类型
      */
@@ -166,21 +155,30 @@ interface ApiService {
         @Body req: FoodSearchReq
     ): ApiResponse<List<FoodInfo>>
 
-    /**
+//    /**
+//     * 查询支付结果
+//     */
+//    @POST
+//    suspend fun queryOrderState(
+//        @Url url: String = "${GlobalData.appBaseUrl}/pay/yx-check-out-pay/turnOrderInfo",
+//        @Body param: HashMap<String, String>
+//    ): ApiResponse<PayResult?>
+   /**
      * 查询支付结果
      */
     @POST
     suspend fun queryOrderState(
-        @Url url: String = "${GlobalData.appBaseUrl}/pay/yx-check-out-pay/turnOrderInfo",
-        @Body param: HashMap<String, String>
-    ): ApiResponse<PayResult?>
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/pay/app/turnOrderInfo",
+//        @Query("orderNo") orderNo: String
+       @Body param: HashMap<String, String>
+    ): ApiResponse<Any?>
 
     /**
      * 现金支付
      */
     @POST
     suspend fun cashPay(
-        @Url url: String = "${GlobalData.appBaseUrl}/pay/yx-check-out-pay/cashPayment",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/pay/app/cashPayment",
         @Body param: HashMap<String, String>
     ): ApiResponse<Boolean?>
 
@@ -189,10 +187,21 @@ interface ApiService {
      */
     @POST
     suspend fun memberPay(
-        @Url url: String = "${GlobalData.appBaseUrl}/pay/yx-check-out-pay/memberPay",
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/pay/app/memberPay",
         @Body param: HashMap<String, String>
     ): ApiResponse<Any?>
 
+    /**
+     * 获取支付二维码
+     */
+    @GET
+    suspend fun getQrCodeImg(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/pay/app/getQrCodeImg",
+        @Query("orderNo") orderNo: String,
+        @Query("memberId") memberId: String?,
+        @Query("totalFee") totalFee: String?
+    ): ApiResponse<String?>
+
     /**
      * 开餐-生成订单
      */
@@ -218,7 +227,7 @@ interface ApiService {
     suspend fun bindOrder(
         @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/boothMachine/app/bingOrder",
         @Query("userId") userId: String,
-        @Query("orderId") orderId: String
+        @Query("orderNo") orderId: String
     ): ApiResponse<Any?>