diff --git a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt index 42e4ee3..36aab30 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt @@ -917,7 +917,8 @@ class MainActivity : BaseActivity() { //即放即取-1,称重-2 mode = if (pickupMode == 1) 1 else 2, paymentFrom = if (settlementMode == 0) 1 else 2, - member = isMember + member = isMember, + cookOrderId = foodInfo.cookOrderId ) submitOrder(request, successBlock) } diff --git a/app/src/main/java/com/sw/dualscreen/model/request/v2/PlaceOrderRequest.kt b/app/src/main/java/com/sw/dualscreen/model/request/v2/PlaceOrderRequest.kt index 6510bd1..e3d5948 100644 --- a/app/src/main/java/com/sw/dualscreen/model/request/v2/PlaceOrderRequest.kt +++ b/app/src/main/java/com/sw/dualscreen/model/request/v2/PlaceOrderRequest.kt @@ -20,5 +20,6 @@ data class PlaceOrderRequest( val foodMaterialId: Long? = null, val member: Boolean? = null, val remark: String? = null, - val deviceId: String? = null + val deviceId: String? = null, + val cookOrderId: String? = null ) diff --git a/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt b/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt index c6646b4..bb4c74b 100644 --- a/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt +++ b/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt @@ -43,6 +43,8 @@ data class FoodInfo( val recommendCalorie: Double? = null, //图片 var foodImg: String? = "", + //按单烹制 ID(菜品列表返回,就餐时原样回传,用于溯源码追踪) + var cookOrderId: String? = "", //----------------------------------- var score: Int = 0, diff --git a/app/src/main/java/com/sw/dualscreen/model/response/v2/NewFoodInfo.kt b/app/src/main/java/com/sw/dualscreen/model/response/v2/NewFoodInfo.kt index 08a4d1f..dd2190e 100644 --- a/app/src/main/java/com/sw/dualscreen/model/response/v2/NewFoodInfo.kt +++ b/app/src/main/java/com/sw/dualscreen/model/response/v2/NewFoodInfo.kt @@ -30,7 +30,9 @@ data class NewFoodInfo( val vipPrice: BigDecimal? = null, val recommendCalorie: Int = 0, val tablewareStatus: Boolean = false, - val tablewareWeight: Int = 0 + val tablewareWeight: Int = 0, + //按单烹制 ID(菜品列表返回,就餐时原样回传,用于溯源码追踪) + var cookOrderId: String? = "", ) : Parcelable /** NewFoodInfo → FoodInfo 映射(V2 数据模型兼容旧版 UI) */ @@ -50,5 +52,6 @@ fun NewFoodInfo.toFoodInfo() = FoodInfo( fruitsVegetables = fruitsVegetables?.toDouble(), meatEggs = meatEggs?.toDouble(), recommendCalorie = recommendCalorie.toDouble(), - foodImg = foodImg + foodImg = foodImg, + cookOrderId = cookOrderId, )