餐盘柜接口改造

2025-12-26 14:05:41 +08:00
parent 5e4dc4baa4
commit 7a6c4012d1
28 changed files with 859 additions and 507 deletions
@@ -12,28 +12,24 @@ import kotlinx.parcelize.Parcelize
@Parcelize
 data class BindParam(
    /**
-     * app版本号
+     * 设备Id
     */
-    var appVersion: String = "",
+    val equipmentId: Int? = null,
    /**
-     * 设备ID
+     * 设备编号
     */
-    @SerializedName("equipmentCode")
    var equipmentCode: String = "",
    /**
     *设备盒子编号
     */
-    @SerializedName("equipmentBoxCode")
    val equipmentBoxCode: String? = null,
    /**
     *
     * 会员Id
     */
-    @SerializedName("memberId")
    val memberId: Int? = null,
    /**
     *餐盘编号
     */
-    @SerializedName("plateNumber")
    val plateNumber: String? = null
 ) : Parcelable
@@ -11,27 +11,19 @@ import kotlinx.parcelize.Parcelize
@Parcelize
 data class LoginParam(
    /**
-     * app版本号
+     * 设备Id
     */
-    var appVersion: String = "",
-    /**
-     * 设备ID
-     */
-    @SerializedName("equipmentCode")
-    var equipmentCode: String = "",
+    val equipmentId: Int? = null,
    /**
     * 会员信息
     */
-    @SerializedName("memberId")
    val memberId: Int? = null,
    /**
     * 密码
     */
-    @SerializedName("password")
    val password: String? = null,
    /**
     * 手机号
     */
-    @SerializedName("phone")
    val phone: String? = null
 ) : Parcelable
@@ -1,9 +1,8 @@
 package com.sw.platecabinet.model.response

-
 import android.os.Parcelable
 import android.text.TextUtils
-import com.google.gson.annotations.SerializedName
+//import com.google.gson.annotations.SerializedName
 import com.sw.platecabinet.GlobalData
 import kotlinx.parcelize.Parcelize

@@ -13,55 +12,51 @@ import kotlinx.parcelize.Parcelize
@Parcelize
 data class EquipmentUserInfo(
    /**
-     * 设备盒子编号
+     * 主键
     */
-    @SerializedName("equipmentBoxCode")
-    var equipmentBoxCode: String? = "",
-    /**
-     * 设备编号
-     */
-    @SerializedName("equipmentCode")
-    var equipmentCode: String? = "",
+    val id: Int? = 0,
    /**
     *
     * 设备Id
     */
-    @SerializedName("equipmentId")
-    val equipmentId: String? = "",
+    val equipmentId: Int? = 0,
    /**
-     * 设备名称
+     * 设备编号
     */
-    @SerializedName("equipmentName")
-    val equipmentName: String? = "",
+    var equipmentCode: String? = "",
    /**
-     * 主键
+     * 设备盒子编号
     */
-    @SerializedName("id")
-    val id: Int? = 0,
+    var equipmentBoxCode: String? = "",
    /**
     * 会员Id
     */
-    @SerializedName("memberId")
    val memberId: Int? = 0,
-
-    @SerializedName("name")
-    val name: String? = "",
-    @SerializedName("phone")
-    val phone: String? = "",
    /**
     * 餐盘编号
     */
-    @SerializedName("plateNumber")
    var plateNumber: String? = "",
+    /**
+     * 设备名称
+     */
+    val equipmentName: String? = "",
+
+    val orderNo: String? = "",
    /**
     *
     * 更新时间
     */
-    @SerializedName("updateTime")
    val updateTime: String? = "",

+    val name: String? = "",
+    val phone: String? = "",
+    val faceUrl: String? = "",
+    val mealTime: String? = "",
+    val mealTimeInterval: String? = "",
+    val openTime: String? = "",
+    val openTimeInterval: String? = "",
+    val eatCount: Int? = 0,

-    @SerializedName("cardBalance")
    var cardBalance: Double? = 0.toDouble(),

    /**
@@ -49,33 +49,36 @@ data class SearchResult(
 ) : Parcelable {
    @Parcelize
    data class Member(
-        @SerializedName("cardBalance")
-        val cardBalance: String? = "",
-        @SerializedName("cardCode")
-        val cardCode: String? = "",
-        @SerializedName("consumptionCount")
-        val consumptionCount: Int? = 0,
-        @SerializedName("consumptionTotal")
-        val consumptionTotal: String? = "",
-        @SerializedName("createTime")
-        val createTime: String? = "",
-        @SerializedName("firstTopUpTime")
-        val firstTopUpTime: String? = "",
-        @SerializedName("id")
+//        @SerializedName("cardBalance")
+//        val cardBalance: String? = "",
+//        @SerializedName("cardCode")
+//        val cardCode: String? = "",
+//        @SerializedName("consumptionCount")
+//        val consumptionCount: Int? = 0,
+//        @SerializedName("consumptionTotal")
+//        val consumptionTotal: String? = "",
+//        @SerializedName("createTime")
+//        val createTime: String? = "",
+//        @SerializedName("firstTopUpTime")
+//        val firstTopUpTime: String? = "",
+//        @SerializedName("id")
+//        val id: Int? = 0,
+//        @SerializedName("integralBalance")
+//        val integralBalance: Int? = 0,
+//        @SerializedName("lastConsumptionTime")
+//        val lastConsumptionTime: String? = "",
+//        @SerializedName("memberFrom")
+//        val memberFrom: Int? = 0,
+//        @SerializedName("name")
+//        val name: String? = "",
+//        @SerializedName("phone")
+//        val phone: String? = "",
+//        @SerializedName("rewardBalance")
+//        val rewardBalance: String? = "",
+//        @SerializedName("topUpBalance")
+//        val topUpBalance: String? = ""
        val id: Int? = 0,
-        @SerializedName("integralBalance")
-        val integralBalance: Int? = 0,
-        @SerializedName("lastConsumptionTime")
-        val lastConsumptionTime: String? = "",
-        @SerializedName("memberFrom")
-        val memberFrom: Int? = 0,
-        @SerializedName("name")
        val name: String? = "",
-        @SerializedName("phone")
        val phone: String? = "",
-        @SerializedName("rewardBalance")
-        val rewardBalance: String? = "",
-        @SerializedName("topUpBalance")
-        val topUpBalance: String? = ""
    ) : Parcelable
 }
@@ -10,16 +10,21 @@ import kotlinx.parcelize.Parcelize
 */
@Parcelize
 data class UserFaceModel(
-    @SerializedName("faceFeature")
-    val faceFeature: String? = "",
-    @SerializedName("faceFeatureString")
-    val faceFeatureString: String? = "",
-    @SerializedName("faceType")
-    val faceType: String? = "",
-    @SerializedName("userFaceId")
-    val userFaceId: String? = "",
-    @SerializedName("userId")
+//    @SerializedName("faceFeature")
+//    val faceFeature: String? = "",
+//    @SerializedName("faceFeatureString")
+//    val faceFeatureString: String? = "",
+//    @SerializedName("faceType")
+//    val faceType: String? = "",
+//    @SerializedName("userFaceId")
+//    val userFaceId: String? = "",
+//    @SerializedName("userId")
+//    val userId: String? = "",
+//    @SerializedName("updateTimeStamp")
+//    val updateTimeStamp: Long = 0,
+
    val userId: String? = "",
-    @SerializedName("updateTimeStamp")
-    val updateTimeStamp: Long = 0,
+    val faceFeatureStr: String? = "",
+
+    val faceDeleted: Boolean?=false
 ) : Parcelable