From 5e762f2067d711440669ab96ab6cc074e433efc4 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: Wed, 10 Jul 2024 11:17:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...essController.java => ShopController.java} | 2 +- .../controller/ShoppingCartController.java | 14 ------ .../takeawaysystemserver/entity/Business.java | 16 ------- .../takeawaysystemserver/entity/Dish.java | 38 ++++++++++++++++ .../takeawaysystemserver/entity/Food.java | 16 ------- .../takeawaysystemserver/entity/Order.java | 19 ++++++++ .../entity/OrderItem.java | 31 +++++++++++++ .../takeawaysystemserver/entity/Shop.java | 45 +++++++++++++++++++ .../takeawaysystemserver/entity/User.java | 15 ++++++- .../model/dto/ShoppingCart.java | 21 +++++++++ .../model/dto/ShoppingCartItem.java | 25 +++++++++++ .../takeawaysystemserver/model/vo/.gitkeep | 0 12 files changed, 194 insertions(+), 48 deletions(-) rename src/main/java/com/example/takeawaysystemserver/controller/{BusinessController.java => ShopController.java} (88%) delete mode 100644 src/main/java/com/example/takeawaysystemserver/controller/ShoppingCartController.java delete mode 100644 src/main/java/com/example/takeawaysystemserver/entity/Business.java create mode 100644 src/main/java/com/example/takeawaysystemserver/entity/Dish.java delete mode 100644 src/main/java/com/example/takeawaysystemserver/entity/Food.java create mode 100644 src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java create mode 100644 src/main/java/com/example/takeawaysystemserver/entity/Shop.java create mode 100644 src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java create mode 100644 src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java create mode 100644 src/main/java/com/example/takeawaysystemserver/model/vo/.gitkeep diff --git a/src/main/java/com/example/takeawaysystemserver/controller/BusinessController.java b/src/main/java/com/example/takeawaysystemserver/controller/ShopController.java similarity index 88% rename from src/main/java/com/example/takeawaysystemserver/controller/BusinessController.java rename to src/main/java/com/example/takeawaysystemserver/controller/ShopController.java index 75caf4d..33c377e 100644 --- a/src/main/java/com/example/takeawaysystemserver/controller/BusinessController.java +++ b/src/main/java/com/example/takeawaysystemserver/controller/ShopController.java @@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Api(tags = "商家模块") -public class BusinessController { +public class ShopController { } diff --git a/src/main/java/com/example/takeawaysystemserver/controller/ShoppingCartController.java b/src/main/java/com/example/takeawaysystemserver/controller/ShoppingCartController.java deleted file mode 100644 index 9f0486f..0000000 --- a/src/main/java/com/example/takeawaysystemserver/controller/ShoppingCartController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.takeawaysystemserver.controller; - -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Ethereal - * @date 2024/7/7 - * @description - */ -@RestController -@Api(tags = "购物车模块") -public class ShoppingCartController { -} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Business.java b/src/main/java/com/example/takeawaysystemserver/entity/Business.java deleted file mode 100644 index e8a0f64..0000000 --- a/src/main/java/com/example/takeawaysystemserver/entity/Business.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.takeawaysystemserver.entity; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Ethereal - * @date 2024/7/7 - * @description - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Business { -} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Dish.java b/src/main/java/com/example/takeawaysystemserver/entity/Dish.java new file mode 100644 index 0000000..64411bb --- /dev/null +++ b/src/main/java/com/example/takeawaysystemserver/entity/Dish.java @@ -0,0 +1,38 @@ +package com.example.takeawaysystemserver.entity; + +import jakarta.annotation.Nullable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author Ethereal + * @date 2024/7/7 + * @description + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Dish { + private String id; + private String shopId; + /** + * 分类名 + */ + private String group; + private String name; + /** + * 价格（分） + */ + private Integer price; + private Integer sellCount; + @Nullable + private String image; + /** + * [key: 类型，如“辣度选择”] : [value: 子选项，如["微辣"]] + */ + @Nullable + private Map subOptions; +} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Food.java b/src/main/java/com/example/takeawaysystemserver/entity/Food.java deleted file mode 100644 index 243f890..0000000 --- a/src/main/java/com/example/takeawaysystemserver/entity/Food.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.takeawaysystemserver.entity; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Ethereal - * @date 2024/7/7 - * @description - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Food { -} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Order.java b/src/main/java/com/example/takeawaysystemserver/entity/Order.java index 282a33a..39b6eec 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/Order.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/Order.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author Ethereal * @date 2024/7/7 @@ -13,4 +15,21 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class Order { + private String id; + private String userId; + private String shopId; + private List items; + private Integer price; + /** + * - 0 已取消 + * - 1 配送中 + * - 2 已完成 + */ + private Integer status; + private String address; + /** + * Unix 时间戳 + */ + private Long createTime; + private Long updateTime; } diff --git a/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java b/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java new file mode 100644 index 0000000..2a1397d --- /dev/null +++ b/src/main/java/com/example/takeawaysystemserver/entity/OrderItem.java @@ -0,0 +1,31 @@ +package com.example.takeawaysystemserver.entity; + +import jakarta.annotation.Nullable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author spyn + * @date 2024/7/10 + * @description + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class OrderItem { + private String dishId; + @Nullable + private Dish dish; + private String orderId; + private Integer count; + private Integer price; + /** + * [key: 类型，如“辣度选择”] : [value: 子选项，如"微辣"] + * 注意这里value是String，而不是String[]，和Dish中的subOptions不同 + */ + @Nullable + private Map options; +} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/Shop.java b/src/main/java/com/example/takeawaysystemserver/entity/Shop.java new file mode 100644 index 0000000..6a6a747 --- /dev/null +++ b/src/main/java/com/example/takeawaysystemserver/entity/Shop.java @@ -0,0 +1,45 @@ +package com.example.takeawaysystemserver.entity; + +import jakarta.annotation.Nullable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * @author Ethereal + * @date 2024/7/7 + * @description + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Shop { + private String id; + private String name; + private Float point; + private Integer sellCount; + /** + * - 0 被删除 + * - 1 营业中 + * - 2 休息中 + */ + private Integer status; + /** + * 格式为HH:mm:ss + */ + private String openTime; + private String closeTime; + private String address; + @Nullable + private List displayedDishes; + @Nullable + private String image; + /** + * [key: 分类名] : [value: 菜品列表] + */ + @Nullable + private Map groups; +} diff --git a/src/main/java/com/example/takeawaysystemserver/entity/User.java b/src/main/java/com/example/takeawaysystemserver/entity/User.java index 21afbd2..6c2c886 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/User.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/User.java @@ -1,5 +1,6 @@ package com.example.takeawaysystemserver.entity; +import jakarta.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,5 +14,17 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class User { - + private String id; + private String username; + @Nullable + private String password; + private String phone; + @Nullable + private String address; + /** + * - 0：被删除 + * - 1：正常 + * - 2：被封禁 + */ + private Integer status; } diff --git a/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java new file mode 100644 index 0000000..69bbeae --- /dev/null +++ b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCart.java @@ -0,0 +1,21 @@ +package com.example.takeawaysystemserver.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author spyn + * @date 2024/7/10 + * @description + */ +@Data +@AllArgsConstructor +@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 new file mode 100644 index 0000000..36c3b97 --- /dev/null +++ b/src/main/java/com/example/takeawaysystemserver/model/dto/ShoppingCartItem.java @@ -0,0 +1,25 @@ +package com.example.takeawaysystemserver.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author spyn + * @date 2024/7/10 + * @description + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ShoppingCartItem { + private String dishId; + private Integer count; + /** + * [key: 类型，如“辣度选择”] : [value: 子选项，如"微辣"] + * 注意这里value是String，而不是String[]，和Dish中的subOptions不同 + */ + private Map subOptions; +} diff --git a/src/main/java/com/example/takeawaysystemserver/model/vo/.gitkeep b/src/main/java/com/example/takeawaysystemserver/model/vo/.gitkeep new file mode 100644 index 0000000..e69de29