diff --git a/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java b/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java index a23fa7c..74b8f1a 100644 --- a/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java @@ -120,12 +120,6 @@ public class AdvanceOrderController { Integer isIndoors = addAdvanceOrderRequest.getIsIndoors(); ThrowUtils.throwIf(shotScene.equals("室内") && isIndoors == 0 || shotScene.equals("室外") && isIndoors == 1, ErrorCode.OPERATION_ERROR, "拍摄场景不存在"); - // 校验当前订单的的拍摄人数是否合理 - Integer number = addAdvanceOrderRequest.getQuantity(); - Integer maxNumber = photoProducts.getMaxNumber(); - Integer minNumber = photoProducts.getMinNumber(); - ThrowUtils.throwIf(number < minNumber || number > maxNumber, ErrorCode.OPERATION_ERROR, "预约人数不在范围内"); - // 校验当前订单预约时间是否被预约过或者已过期 String specificDate = bookingDate.getSpecificDate(); String timePoint = bookingTime.getTimePoint(); @@ -137,9 +131,7 @@ public class AdvanceOrderController { ContactsSnapshot contactsSnapshot = new ContactsSnapshot(); BeanUtils.copyProperties(contacts, contactsSnapshot); // 计算订单总金额 - BigDecimal price = photoProducts.getPrice(); - Integer quantity = addAdvanceOrderRequest.getQuantity(); - BigDecimal totalAmount = price.multiply(BigDecimal.valueOf(quantity)); + BigDecimal totalAmount = photoProducts.getPrice(); // 生成订单编号 String orderNumber = OrderNumberUtils.generateOrderId(); // 封装写真预约订单 diff --git a/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java index 9210b53..aafbabf 100644 --- a/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java @@ -54,19 +54,6 @@ public class AdvanceOrderAddRequest implements Serializable { private Integer isMakeup; - /** - * 是否选择摄影服务 - */ - @Schema(description = "是否选择摄影服务", example = "1") - private Integer isPhotography; - - - /** - * 购买数量 - */ - @Schema(description = "购买数量", example = "3") - private Integer quantity; - @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryAddRequest.java index 074b6fe..e1a493f 100644 --- a/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryAddRequest.java @@ -5,7 +5,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; /** * 服装类别添加请求体 @@ -20,12 +19,6 @@ public class ClothesCategoryAddRequest implements Serializable { @Schema(description = "服装类别名称", example = "夏季男装") private String name; - /** - * 定金 - */ - @Schema(description = "服装类别定金", example = "100.00") - private BigDecimal price; - @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryUpdateRequest.java index c7e2a4e..ba7b632 100644 --- a/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryUpdateRequest.java @@ -5,7 +5,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; /** * 服装类别更新请求体 @@ -26,13 +25,6 @@ public class ClothesCategoryUpdateRequest implements Serializable { @Schema(description = "服装类别名称", example = "秋季女装") private String name; - /** - * 定金 - */ - @Schema(description = "服装类别定金", example = "150.00") - private BigDecimal price; - - @Serial private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsAddRequest.java index b9fd272..4641698 100644 --- a/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsAddRequest.java @@ -38,17 +38,10 @@ public class PhotoProductsAddRequest implements Serializable { /** - * 最小预约人数 + * 限定预约人数 */ - @Schema(description = "最小预约人数", example = "4") - private Integer minNumber; - - - /** - * 最大预约人数 - */ - @Schema(description = "最大预约人数", example = "10") - private Integer maxNumber; + @Schema(description = "限定预约人数", example = "4") + private Integer count; /** diff --git a/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsUpdateRequest.java index e0bb719..7790538 100644 --- a/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsUpdateRequest.java @@ -41,17 +41,10 @@ public class PhotoProductsUpdateRequest implements Serializable { /** - * 最小预约人数 + * 限定预约人数 */ - @Schema(description = "最小预约人数", example = "4") - private Integer minNumber; - - - /** - * 最大预约人数 - */ - @Schema(description = "最大预约人数", example = "10") - private Integer maxNumber; + @Schema(description = "限定预约人数", example = "4") + private Integer count; /** diff --git a/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java b/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java index 55a6f73..4926c80 100644 --- a/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java +++ b/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java @@ -79,12 +79,6 @@ public class AdvanceOrder implements Serializable { private Integer isMakeup; - /** - * 是否选择摄影服务 - */ - private Integer isPhotography; - - /** * 用户id */ @@ -97,12 +91,6 @@ public class AdvanceOrder implements Serializable { private String orderStatus; - /** - * 购买数量 - */ - private Integer quantity; - - /** * 创建时间 */ diff --git a/src/main/java/com/cultural/heritage/model/entity/ClothesCategory.java b/src/main/java/com/cultural/heritage/model/entity/ClothesCategory.java index 1996a97..f9af043 100644 --- a/src/main/java/com/cultural/heritage/model/entity/ClothesCategory.java +++ b/src/main/java/com/cultural/heritage/model/entity/ClothesCategory.java @@ -7,7 +7,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; @@ -32,10 +31,6 @@ public class ClothesCategory implements Serializable { */ private String name; - /** - * 定金 - */ - private BigDecimal price; /** * 创建时间 diff --git a/src/main/java/com/cultural/heritage/model/entity/PhotoProducts.java b/src/main/java/com/cultural/heritage/model/entity/PhotoProducts.java index 7c88195..1822186 100644 --- a/src/main/java/com/cultural/heritage/model/entity/PhotoProducts.java +++ b/src/main/java/com/cultural/heritage/model/entity/PhotoProducts.java @@ -46,15 +46,9 @@ public class PhotoProducts implements Serializable { /** - * 最小预约人数 + * 限定预约人数 */ - private Integer minNumber; - - - /** - * 最大预约人数 - */ - private Integer maxNumber; + private Integer count; /** diff --git a/src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java b/src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java index d467868..95763fe 100644 --- a/src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java @@ -68,12 +68,6 @@ public class AdvanceOrderVO implements Serializable { private Integer isMakeup; - /** - * 是否选择摄影服务 - */ - private Integer isPhotography; - - /** * 用户id */ @@ -86,12 +80,6 @@ public class AdvanceOrderVO implements Serializable { private String orderStatus; - /** - * 购买数量 - */ - private Integer quantity; - - /** * 创建时间 */ diff --git a/src/main/java/com/cultural/heritage/model/vo/clothes/ClothesCategoryVO.java b/src/main/java/com/cultural/heritage/model/vo/clothes/ClothesCategoryVO.java index 555674f..cc86384 100644 --- a/src/main/java/com/cultural/heritage/model/vo/clothes/ClothesCategoryVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/clothes/ClothesCategoryVO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.math.BigDecimal; @Data public class ClothesCategoryVO implements Serializable { @@ -19,11 +18,6 @@ public class ClothesCategoryVO implements Serializable { */ private String name; - /** - * 定金 - */ - private BigDecimal price; - @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsMainInfoVO.java b/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsMainInfoVO.java index 49701cf..6f86e1a 100644 --- a/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsMainInfoVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsMainInfoVO.java @@ -35,15 +35,9 @@ public class PhotoProductsMainInfoVO implements Serializable { /** - * 最小预约人数 + * 限定预约人数 */ - private Integer minNumber; - - - /** - * 最大预约人数 - */ - private Integer maxNumber; + private Integer count; /** diff --git a/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsVO.java b/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsVO.java index d416adf..5e92cd7 100644 --- a/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsVO.java @@ -37,15 +37,9 @@ public class PhotoProductsVO implements Serializable { /** - * 最小预约人数 + * 限定预约人数 */ - private Integer minNumber; - - - /** - * 最大预约人数 - */ - private Integer maxNumber; + private Integer count; /** diff --git a/src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java b/src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java index e9f4bbe..4732ed1 100644 --- a/src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java @@ -49,19 +49,15 @@ public class AdvanceOrderServiceImpl extends ServiceImpl maxNumber) { - throw new BusinessException(ErrorCode.PARAMS_ERROR, "最小预约人数大于最大预约人数"); + if (count <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "限定预约人数不能为0"); } if (ObjectUtils.isEmpty(price) || price.compareTo(BigDecimal.ZERO) < 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "价格参数错误");