feat(order): 开餐下单新增cookOrderId支持用于溯源追踪
- 在FoodInfo数据模型中新增cookOrderId字段 - 在NewFoodInfo数据模型中新增cookOrderId字段并实现映射 - 在PlaceOrderRequest请求模型中新增cookOrderId参数 - 在订单提交流程中传递cookOrderId参数 - 实现菜品列表到就餐环节的ID回传机制
This commit is contained in:
@@ -917,7 +917,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
|
||||
//即放即取-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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -43,6 +43,8 @@ data class FoodInfo(
|
||||
val recommendCalorie: Double? = null,
|
||||
//图片
|
||||
var foodImg: String? = "",
|
||||
//按单烹制 ID(菜品列表返回,就餐时原样回传,用于溯源码追踪)
|
||||
var cookOrderId: String? = "",
|
||||
|
||||
//-----------------------------------
|
||||
var score: Int = 0,
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user