From 780ab64d83c72f6e527ca00201e06dcb7cf15ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E7=9A=AE=E5=B9=BC=E9=B8=9F?= <2960474346@qq.com> Date: Thu, 11 Jul 2024 16:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../takeawaysystemserver/entity/Dish.java | 13 +++++++++++++ .../takeawaysystemserver/entity/Order.java | 9 +++++++++ .../takeawaysystemserver/entity/OrderItem.java | 6 +++++- .../takeawaysystemserver/entity/Shop.java | 18 +++++++++++++++++- .../model/dto/ShoppingCart.java | 3 +++ .../model/dto/ShoppingCartItem.java | 4 ++++ 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Dish.java b/src/main/java/com/example/takeawaysystemserver/entity/Dish.java index 64411bb..59cd369 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/Dish.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/Dish.java @@ -17,20 +17,33 @@ import java.util.Map; @NoArgsConstructor public class Dish { private String id; + /** + * 商家的ID + */ private String shopId; /** * 分类名 */ private String group; + /** + * 菜品名 + */ private String name; /** * 价格(分) */ private Integer price; + /** + * 销量 + */ private Integer sellCount; + /** + * 图片链接 + */ @Nullable private String image; /** + * 子选项 * [key: 类型,如“辣度选择”] : [value: 子选项,如["微辣"]] */ @Nullable diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Order.java b/src/main/java/com/example/takeawaysystemserver/entity/Order.java index 39b6eec..c217812 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/Order.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/Order.java @@ -18,7 +18,13 @@ public class Order { private String id; private String userId; private String shopId; + /** + * 订单项 + */ private List items; + /** + * 总价(分) + */ private Integer price; /** * - 0 已取消 @@ -26,6 +32,9 @@ public class Order { * - 2 已完成 */ private Integer status; + /** + * 送餐地址 + */ private String address; /** * Unix 时间戳 diff --git a/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java b/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java index 2a1397d..ef2f2d9 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java @@ -10,7 +10,7 @@ import java.util.Map; /** * @author spyn * @date 2024/7/10 - * @description + * @description 订单内的子项 */ @Data @AllArgsConstructor @@ -20,9 +20,13 @@ public class OrderItem { @Nullable private Dish dish; private String orderId; + /** + * 购买份数 + */ private Integer count; private Integer price; /** + * 子选项 * [key: 类型,如“辣度选择”] : [value: 子选项,如"微辣"] * 注意这里value是String,而不是String[],和Dish中的subOptions不同 */ diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Shop.java b/src/main/java/com/example/takeawaysystemserver/entity/Shop.java index 6a6a747..216d062 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/Shop.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/Shop.java @@ -19,7 +19,13 @@ import java.util.Map; public class Shop { private String id; private String name; + /** + * 评分(暂且不做评论系统,这里写死) + */ private Float point; + /** + * 销量 + */ private Integer sellCount; /** * - 0 被删除 @@ -28,16 +34,26 @@ public class Shop { */ private Integer status; /** - * 格式为HH:mm:ss + * 开店和闭店时间,格式为HH:mm:ss */ private String openTime; private String closeTime; + /** + * 店铺地址(字符串) + */ private String address; + /** + * APP首页展示的菜品(最多3份) + */ @Nullable private List displayedDishes; + /** + * 店铺的icon + */ @Nullable private String image; /** + * 菜品分类 * [key: 分类名] : [value: 菜品列表] */ @Nullable diff --git a/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java index 69bbeae..e66596f 100644 --- a/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java +++ b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java @@ -15,6 +15,9 @@ import lombok.NoArgsConstructor; public class ShoppingCart { // 不需要用户ID,用户信息从token中获取 private String shopId; + /** + * 订单子项 + */ private ShoppingCartItem[] dishes; // 用户地址,用户可能会修改地址,故以该字段为准 private String address; diff --git a/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java index 36c3b97..7f52e7b 100644 --- a/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java +++ b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java @@ -16,8 +16,12 @@ import java.util.Map; @NoArgsConstructor public class ShoppingCartItem { private String dishId; + /** + * 份数 + */ private Integer count; /** + * 子选项 * [key: 类型,如“辣度选择”] : [value: 子选项,如"微辣"] * 注意这里value是String,而不是String[],和Dish中的subOptions不同 */