diff --git a/src/main/java/com/cultural/heritage/controller/good/CartRecordController.java b/src/main/java/com/cultural/heritage/controller/good/CartRecordController.java index a113ccd..c743593 100644 --- a/src/main/java/com/cultural/heritage/controller/good/CartRecordController.java +++ b/src/main/java/com/cultural/heritage/controller/good/CartRecordController.java @@ -11,10 +11,10 @@ import com.cultural.heritage.model.dto.cart.CartRecordAddRequest; import com.cultural.heritage.model.dto.cart.CartRecordUpdateRequest; import com.cultural.heritage.model.entity.CartRecord; import com.cultural.heritage.model.entity.Good; -import com.cultural.heritage.model.vo.CartOrderVO; -import com.cultural.heritage.model.vo.CartRecordQueryVO; -import com.cultural.heritage.model.vo.CartRecordVO; -import com.cultural.heritage.model.vo.GoodVO; +import com.cultural.heritage.model.vo.cart.CartOrderVO; +import com.cultural.heritage.model.vo.cart.CartRecordQueryVO; +import com.cultural.heritage.model.vo.cart.CartRecordVO; +import com.cultural.heritage.model.vo.good.GoodVO; import com.cultural.heritage.service.good.CartRecordService; import com.cultural.heritage.service.good.GoodService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/cultural/heritage/controller/order/OrderController.java b/src/main/java/com/cultural/heritage/controller/order/OrderController.java index b766a64..bf516b5 100644 --- a/src/main/java/com/cultural/heritage/controller/order/OrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/OrderController.java @@ -18,7 +18,7 @@ import com.cultural.heritage.model.dto.order.OrderUpdateRequest; import com.cultural.heritage.model.dto.order.capital.OrderMainInfoAddRequest; import com.cultural.heritage.model.entity.Order; import com.cultural.heritage.model.entity.OrderItems; -import com.cultural.heritage.model.vo.OrderVO; +import com.cultural.heritage.model.vo.order.OrderVO; import com.cultural.heritage.service.order.OrderItemService; import com.cultural.heritage.service.order.OrderService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/cultural/heritage/controller/user/UserController.java b/src/main/java/com/cultural/heritage/controller/user/UserController.java index c790ff5..3703f4a 100644 --- a/src/main/java/com/cultural/heritage/controller/user/UserController.java +++ b/src/main/java/com/cultural/heritage/controller/user/UserController.java @@ -16,7 +16,7 @@ import com.cultural.heritage.exception.ThrowUtils; import com.cultural.heritage.model.dto.CommonRequest; import com.cultural.heritage.model.dto.user.*; import com.cultural.heritage.model.entity.User; -import com.cultural.heritage.model.vo.UserVO; +import com.cultural.heritage.model.vo.user.UserVO; import com.cultural.heritage.service.user.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/cultural/heritage/model/vo/CartOrderVO.java b/src/main/java/com/cultural/heritage/model/vo/cart/CartOrderVO.java similarity index 78% rename from src/main/java/com/cultural/heritage/model/vo/CartOrderVO.java rename to src/main/java/com/cultural/heritage/model/vo/cart/CartOrderVO.java index 2e88e26..5ac512d 100644 --- a/src/main/java/com/cultural/heritage/model/vo/CartOrderVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/cart/CartOrderVO.java @@ -1,5 +1,6 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.cart; +import com.cultural.heritage.model.vo.good.GoodVO; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/cultural/heritage/model/vo/CartRecordQueryVO.java b/src/main/java/com/cultural/heritage/model/vo/cart/CartRecordQueryVO.java similarity index 88% rename from src/main/java/com/cultural/heritage/model/vo/CartRecordQueryVO.java rename to src/main/java/com/cultural/heritage/model/vo/cart/CartRecordQueryVO.java index 5b57177..6387078 100644 --- a/src/main/java/com/cultural/heritage/model/vo/CartRecordQueryVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/cart/CartRecordQueryVO.java @@ -1,4 +1,4 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.cart; import lombok.Data; diff --git a/src/main/java/com/cultural/heritage/model/vo/CartRecordVO.java b/src/main/java/com/cultural/heritage/model/vo/cart/CartRecordVO.java similarity index 87% rename from src/main/java/com/cultural/heritage/model/vo/CartRecordVO.java rename to src/main/java/com/cultural/heritage/model/vo/cart/CartRecordVO.java index 3c85668..db228ed 100644 --- a/src/main/java/com/cultural/heritage/model/vo/CartRecordVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/cart/CartRecordVO.java @@ -1,5 +1,6 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.cart; +import com.cultural.heritage.model.vo.good.GoodVO; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/cultural/heritage/model/vo/GoodVO.java b/src/main/java/com/cultural/heritage/model/vo/good/GoodVO.java similarity index 93% rename from src/main/java/com/cultural/heritage/model/vo/GoodVO.java rename to src/main/java/com/cultural/heritage/model/vo/good/GoodVO.java index 8b9cb5e..6760403 100644 --- a/src/main/java/com/cultural/heritage/model/vo/GoodVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/good/GoodVO.java @@ -1,4 +1,4 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.good; import lombok.Data; diff --git a/src/main/java/com/cultural/heritage/model/vo/OrderVO.java b/src/main/java/com/cultural/heritage/model/vo/order/OrderVO.java similarity index 97% rename from src/main/java/com/cultural/heritage/model/vo/OrderVO.java rename to src/main/java/com/cultural/heritage/model/vo/order/OrderVO.java index 4f67f4b..47cd710 100644 --- a/src/main/java/com/cultural/heritage/model/vo/OrderVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/order/OrderVO.java @@ -1,4 +1,4 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.order; import com.cultural.heritage.model.dto.snapshot.AddressSnapshot; diff --git a/src/main/java/com/cultural/heritage/model/vo/UserVO.java b/src/main/java/com/cultural/heritage/model/vo/user/UserVO.java similarity index 92% rename from src/main/java/com/cultural/heritage/model/vo/UserVO.java rename to src/main/java/com/cultural/heritage/model/vo/user/UserVO.java index 55c29ee..fd43f54 100644 --- a/src/main/java/com/cultural/heritage/model/vo/UserVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/user/UserVO.java @@ -1,4 +1,4 @@ -package com.cultural.heritage.model.vo; +package com.cultural.heritage.model.vo.user; import lombok.Data; diff --git a/src/main/java/com/cultural/heritage/service/good/CartRecordService.java b/src/main/java/com/cultural/heritage/service/good/CartRecordService.java index 4141532..2cbb438 100644 --- a/src/main/java/com/cultural/heritage/service/good/CartRecordService.java +++ b/src/main/java/com/cultural/heritage/service/good/CartRecordService.java @@ -3,7 +3,7 @@ package com.cultural.heritage.service.good; import com.baomidou.mybatisplus.extension.service.IService; import com.cultural.heritage.model.dto.cart.CartRecordAddRequest; import com.cultural.heritage.model.entity.CartRecord; -import com.cultural.heritage.model.vo.CartRecordVO; +import com.cultural.heritage.model.vo.cart.CartRecordVO; import java.util.List; diff --git a/src/main/java/com/cultural/heritage/service/good/impl/CartRecordServiceImpl.java b/src/main/java/com/cultural/heritage/service/good/impl/CartRecordServiceImpl.java index 1d5f337..7056b00 100644 --- a/src/main/java/com/cultural/heritage/service/good/impl/CartRecordServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/good/impl/CartRecordServiceImpl.java @@ -9,8 +9,8 @@ import com.cultural.heritage.mapper.GoodMapper; import com.cultural.heritage.model.dto.cart.CartRecordAddRequest; import com.cultural.heritage.model.entity.CartRecord; import com.cultural.heritage.model.entity.Good; -import com.cultural.heritage.model.vo.CartRecordVO; -import com.cultural.heritage.model.vo.GoodVO; +import com.cultural.heritage.model.vo.cart.CartRecordVO; +import com.cultural.heritage.model.vo.good.GoodVO; import com.cultural.heritage.service.good.CartRecordService; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/cultural/heritage/service/user/UserService.java b/src/main/java/com/cultural/heritage/service/user/UserService.java index e2b2e3f..ce826a3 100644 --- a/src/main/java/com/cultural/heritage/service/user/UserService.java +++ b/src/main/java/com/cultural/heritage/service/user/UserService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.cultural.heritage.model.dto.user.UserQueryRequest; import com.cultural.heritage.model.entity.User; -import com.cultural.heritage.model.vo.UserVO; +import com.cultural.heritage.model.vo.user.UserVO; import jakarta.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java b/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java index a4e5fea..a69627f 100644 --- a/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/user/impl/UserServiceImpl.java @@ -13,7 +13,7 @@ import com.cultural.heritage.mapper.UserMapper; import com.cultural.heritage.model.dto.user.UserQueryRequest; import com.cultural.heritage.model.entity.User; import com.cultural.heritage.model.enums.UserRoleEnum; -import com.cultural.heritage.model.vo.UserVO; +import com.cultural.heritage.model.vo.user.UserVO; import com.cultural.heritage.service.user.UserService; import com.cultural.heritage.utils.SqlUtils; import jakarta.servlet.http.HttpServletRequest;