admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文件上传https

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-21 18:13:01 +08:00
parent 3bcdc44828
commit 861f29600b
15 changed files with 17 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java
View File

@ -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();
// 封装写真预约订单

13
src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java
View File

@ -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;

7
src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryAddRequest.java
View File

@ -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;

8
src/main/java/com/cultural/heritage/model/dto/clotheCategory/ClothesCategoryUpdateRequest.java
View File

@ -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;
}

13
src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsAddRequest.java
View File

@ -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;
/**

13
src/main/java/com/cultural/heritage/model/dto/photoProducts/PhotoProductsUpdateRequest.java
View File

@ -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;
/**

12
src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java
View File

@ -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;
/**
* 创建时间
*/

5
src/main/java/com/cultural/heritage/model/entity/ClothesCategory.java
View File

@ -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;
/**
* 创建时间

10
src/main/java/com/cultural/heritage/model/entity/PhotoProducts.java
View File

@ -46,15 +46,9 @@ public class PhotoProducts implements Serializable {
/**
* 最小预约人数
* 限定预约人数
*/
private Integer minNumber;
/**
* 最大预约人数
*/
private Integer maxNumber;
private Integer count;
/**

12
src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java
View File

@ -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;
/**
* 创建时间
*/

6
src/main/java/com/cultural/heritage/model/vo/clothes/ClothesCategoryVO.java
View File

@ -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;

10
src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsMainInfoVO.java
View File

@ -35,15 +35,9 @@ public class PhotoProductsMainInfoVO implements Serializable {
/**
* 最小预约人数
* 限定预约人数
*/
private Integer minNumber;
/**
* 最大预约人数
*/
private Integer maxNumber;
private Integer count;
/**

10
src/main/java/com/cultural/heritage/model/vo/photoProducts/PhotoProductsVO.java
View File

@ -37,15 +37,9 @@ public class PhotoProductsVO implements Serializable {
/**
* 最小预约人数
* 限定预约人数
*/
private Integer minNumber;
/**
* 最大预约人数
*/
private Integer maxNumber;
private Integer count;
/**

6
src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java
View File

@ -49,19 +49,15 @@ public class AdvanceOrderServiceImpl extends ServiceImpl<AdvanceOrderMapper, Adv
String timePoint = advanceOrder.getTimePoint();
Integer isIndoors = advanceOrder.getIsIndoors();
Integer isMakeup = advanceOrder.getIsMakeup();
Integer isPhotography = advanceOrder.getIsPhotography();
String orderStatus = advanceOrder.getOrderStatus();
Long userId = advanceOrder.getUserId();
if (ObjectUtils.isEmpty(totalAmount) || totalAmount.compareTo(BigDecimal.ZERO) <= 0) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "定金参数错误");
}
if (ObjectUtils.anyNull(contactsSnapshot, photoProductsSnapshot, isIndoors, isMakeup, isPhotography, userId)) {
if (ObjectUtils.anyNull(contactsSnapshot, photoProductsSnapshot, isIndoors, isMakeup, userId)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "存在参数为null");
}
if (isIndoors != 0 && isIndoors != 1 || isMakeup != 0 && isMakeup != 1 || isPhotography != 0 && isPhotography != 1) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "布尔参数错误");
}
if (StringUtils.isAnyBlank(specificDate, timePoint, orderStatus)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "存在参数为空");
}

10
src/main/java/com/cultural/heritage/service/book/impl/PhotoProductsServiceImpl.java
View File

@ -28,9 +28,8 @@ public class PhotoProductsServiceImpl extends ServiceImpl<PhotoProductsMapper, P
Long id = photoProducts.getId();
String name = photoProducts.getName();
String introImg = photoProducts.getIntroImg();
Integer count = photoProducts.getCount();
String richText = photoProducts.getRichText();
Integer minNumber = photoProducts.getMinNumber();
Integer maxNumber = photoProducts.getMaxNumber();
String shotScene = photoProducts.getShotScene();
BigDecimal price = photoProducts.getPrice();
String categoryName = photoProducts.getCategoryName();
@ -43,11 +42,8 @@ public class PhotoProductsServiceImpl extends ServiceImpl<PhotoProductsMapper, P
if (StringUtils.isAnyBlank(name, introImg, richText, shotScene, categoryName)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "参数不全");
}
if (ObjectUtils.anyNull(minNumber, maxNumber)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "预约人数参数错误");
}
if (minNumber > 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, "价格参数错误");