扫码支付增加会员id字段

app/src/main/java/com/sw/dualscreen/repository/RemoteRepository.kt

@@ -76,7 +76,8 @@ class RemoteRepository constructor(
             )
         }
     }
- /**
+
+    /**
      * 获取人脸数据
      */
     suspend fun getFaceIncrementList(
@@ -134,16 +135,18 @@ class RemoteRepository constructor(
     suspend fun getRestInfoFoodsByType(
         foodName: String,
         pageNum: Int = 1,
-        pageSize:Int = 50
+        pageSize: Int = 50
     ): ApiResponse<List<FoodInfo>> {
         return safeApiCall {
-            apiService.getRestInfoFoodsByType(param = hashMapOf(
-                "name" to foodName,
-                "pageNum" to "$pageNum",
-                "pageSize" to "$pageSize",
-                //"订单来源权举:1-营养秤,2-档口
-                "deviceType" to "2"
-            ))
+            apiService.getRestInfoFoodsByType(
+                param = hashMapOf(
+                    "name" to foodName,
+                    "pageNum" to "$pageNum",
+                    "pageSize" to "$pageSize",
+                    //"订单来源权举:1-营养秤,2-档口
+                    "deviceType" to "2"
+                )
+            )
         }
     }
 
@@ -189,12 +192,17 @@ class RemoteRepository constructor(
     /**
      * 二维码支付
      */
-    suspend fun qrCodePay(authCode: String,orderNo: String): ApiResponse<String?> {
+    suspend fun qrCodePay(
+        authCode: String,
+        orderNo: String,
+        memberId: String?
+    ): ApiResponse<String?> {
         return safeApiCall {
             apiService.qrCodePay(
                 param = hashMapOf(
                     "authCode" to authCode,
                     "outTradeNo" to orderNo,
+                    "memberId" to memberId,
                     "orderType" to "0"
                 )
             )
@@ -262,7 +270,7 @@ class RemoteRepository constructor(
     /**
      * 会员支付
      */
-    suspend fun memberPay(param: HashMap<String, String>): ApiResponse<Any?> {
+    suspend fun memberPay(param: HashMap<String, String?>): ApiResponse<Any?> {
         return safeApiCall {
             apiService.memberPay(param = param)
         }
@@ -291,10 +299,12 @@ class RemoteRepository constructor(
      */
     suspend fun getMemberInfoByPhone(phone: String, key: String): ApiResponse<MemberInfo?> {
         return safeApiCall {
-            apiService.getMemberInfoByPhone(param = hashMapOf(
-                "phone" to phone,
-                "password" to key
-            ))
+            apiService.getMemberInfoByPhone(
+                param = hashMapOf(
+                    "phone" to phone,
+                    "password" to key
+                )
+            )
         }
     }
 
@@ -332,12 +342,14 @@ class RemoteRepository constructor(
         }
     }
 
-    suspend fun deleteCollectFood(foodId:String?, version: String?): ApiResponse<Any?> {
+    suspend fun deleteCollectFood(foodId: String?, version: String?): ApiResponse<Any?> {
         return safeApiCall {
-            apiService.deleteCollectFood(param = mutableMapOf(
-                "foodId" to foodId,
-                "version" to version
-            ))
+            apiService.deleteCollectFood(
+                param = mutableMapOf(
+                    "foodId" to foodId,
+                    "version" to version
+                )
+            )
         }
     }
 }