From 1c0d0bf8dfd9489205a29833175fc3b3f3652975 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Tue, 19 Nov 2024 14:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E5=86=99=E7=9C=9F?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heritage/HeritageApplication.java | 2 + .../heritage/aop/AuthInterceptor.java | 2 +- .../heritage/config/BookingDateConfig.java | 38 ++++ .../heritage/constant/BookConstant.java | 11 + .../book/AdvanceOrderController.java | 171 +++++++++++++++ .../book/BookingDateController.java | 113 ++++++++++ .../book/ClothesGradeController.java | 120 +++++++++++ .../book/ClothesInfoController.java | 197 ++++++++++++++++++ .../controller/good/CategoryController.java | 19 +- .../controller/order/OrderController.java | 2 +- .../heritage/mapper/AdvanceOrderMapper.java | 7 + .../heritage/mapper/BookingDateMapper.java | 7 + .../heritage/mapper/ClothesGradeMapper.java | 7 + .../heritage/mapper/ClothesInfoMapper.java | 7 + .../model/dto/CommonStringRequest.java | 23 ++ .../advanceOrder/AdvanceOrderAddRequest.java | 88 ++++++++ .../AdvanceOrderQueryRequest.java | 84 ++++++++ .../model/dto/book/BookingDateAddRequest.java | 50 +++++ .../dto/book/BookingDateUpdateRequest.java | 58 ++++++ .../clothesgrade/ClothesGradeAddRequest.java | 50 +++++ .../ClothesGradeUpdateRequest.java | 58 ++++++ .../clothesinfo/ClothesInfoAddRequest.java | 61 ++++++ .../clothesinfo/ClothesInfoQueryRequest.java | 55 +++++ .../clothesinfo/ClothesInfoUpdateRequest.java | 66 ++++++ .../model/dto/good/GoodAddRequest.java | 1 + .../model/dto/order/OrderAddRequest.java | 7 - .../heritage/model/entity/AdvanceOrder.java | 115 ++++++++++ .../heritage/model/entity/BookingDate.java | 77 +++++++ .../heritage/model/entity/ClothesGrade.java | 77 +++++++ .../heritage/model/entity/ClothesInfo.java | 83 ++++++++ .../cultural/heritage/model/entity/User.java | 3 + .../model/vo/advanceorder/AdvanceOrderVO.java | 97 +++++++++ .../heritage/model/vo/book/BookingDateVO.java | 52 +++++ .../model/vo/clothesgrade/ClothesGradeVO.java | 51 +++++ .../vo/clothesinfo/ClothesInfoLabelVO.java | 44 ++++ .../model/vo/clothesinfo/ClothesInfoVO.java | 56 +++++ .../address/impl/AddressServiceImpl.java | 3 +- .../address/impl/ContactsServiceImpl.java | 4 + .../service/book/AdvanceOrderService.java | 20 ++ .../service/book/BookingDateService.java | 13 ++ .../service/book/ClothesGradeService.java | 19 ++ .../service/book/ClothesInfoService.java | 20 ++ .../book/impl/AdvanceOrderServiceImpl.java | 92 ++++++++ .../book/impl/BookingDateServiceImpl.java | 28 +++ .../book/impl/ClothesGradeServiceImpl.java | 76 +++++++ .../book/impl/ClothesInfoServiceImpl.java | 70 +++++++ .../service/good/impl/GoodServiceImpl.java | 8 - src/main/resources/application.yml | 10 +- .../resources/mapper/AdvanceOrderMapper.xml | 7 + .../resources/mapper/BookingDateMapper.xml | 7 + .../resources/mapper/ClothesGradeMapper.xml | 7 + .../resources/mapper/ClothesInfoMapper.xml | 7 + 52 files changed, 2323 insertions(+), 27 deletions(-) create mode 100644 src/main/java/com/cultural/heritage/config/BookingDateConfig.java create mode 100644 src/main/java/com/cultural/heritage/constant/BookConstant.java create mode 100644 src/main/java/com/cultural/heritage/controller/book/AdvanceOrderController.java create mode 100644 src/main/java/com/cultural/heritage/controller/book/BookingDateController.java create mode 100644 src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java create mode 100644 src/main/java/com/cultural/heritage/controller/book/ClothesInfoController.java create mode 100644 src/main/java/com/cultural/heritage/mapper/AdvanceOrderMapper.java create mode 100644 src/main/java/com/cultural/heritage/mapper/BookingDateMapper.java create mode 100644 src/main/java/com/cultural/heritage/mapper/ClothesGradeMapper.java create mode 100644 src/main/java/com/cultural/heritage/mapper/ClothesInfoMapper.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/CommonStringRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderQueryRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/book/BookingDateAddRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/book/BookingDateUpdateRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeAddRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeUpdateRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoAddRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoQueryRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoUpdateRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java create mode 100644 src/main/java/com/cultural/heritage/model/entity/BookingDate.java create mode 100644 src/main/java/com/cultural/heritage/model/entity/ClothesGrade.java create mode 100644 src/main/java/com/cultural/heritage/model/entity/ClothesInfo.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/book/BookingDateVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/clothesgrade/ClothesGradeVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoLabelVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoVO.java create mode 100644 src/main/java/com/cultural/heritage/service/book/AdvanceOrderService.java create mode 100644 src/main/java/com/cultural/heritage/service/book/BookingDateService.java create mode 100644 src/main/java/com/cultural/heritage/service/book/ClothesGradeService.java create mode 100644 src/main/java/com/cultural/heritage/service/book/ClothesInfoService.java create mode 100644 src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java create mode 100644 src/main/java/com/cultural/heritage/service/book/impl/BookingDateServiceImpl.java create mode 100644 src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java create mode 100644 src/main/java/com/cultural/heritage/service/book/impl/ClothesInfoServiceImpl.java create mode 100644 src/main/resources/mapper/AdvanceOrderMapper.xml create mode 100644 src/main/resources/mapper/BookingDateMapper.xml create mode 100644 src/main/resources/mapper/ClothesGradeMapper.xml create mode 100644 src/main/resources/mapper/ClothesInfoMapper.xml diff --git a/src/main/java/com/cultural/heritage/HeritageApplication.java b/src/main/java/com/cultural/heritage/HeritageApplication.java index a6deaea..539742f 100644 --- a/src/main/java/com/cultural/heritage/HeritageApplication.java +++ b/src/main/java/com/cultural/heritage/HeritageApplication.java @@ -3,9 +3,11 @@ package com.cultural.heritage; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @MapperScan("com.cultural.heritage.mapper") +@EnableScheduling public class HeritageApplication { public static void main(String[] args) { diff --git a/src/main/java/com/cultural/heritage/aop/AuthInterceptor.java b/src/main/java/com/cultural/heritage/aop/AuthInterceptor.java index a6e5021..96fc42d 100644 --- a/src/main/java/com/cultural/heritage/aop/AuthInterceptor.java +++ b/src/main/java/com/cultural/heritage/aop/AuthInterceptor.java @@ -23,7 +23,7 @@ public class AuthInterceptor { */ @Around("@annotation(authCheck)") public Object doInterceptor(ProceedingJoinPoint joinPoint, AuthCheck authCheck) throws Throwable { - //接口的权限 + // 接口的权限 // String mustRole = authCheck.mustRole(); // RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes(); // HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); diff --git a/src/main/java/com/cultural/heritage/config/BookingDateConfig.java b/src/main/java/com/cultural/heritage/config/BookingDateConfig.java new file mode 100644 index 0000000..e23bd93 --- /dev/null +++ b/src/main/java/com/cultural/heritage/config/BookingDateConfig.java @@ -0,0 +1,38 @@ +package com.cultural.heritage.config; + +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.constant.BookConstant; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.entity.BookingDate; +import com.cultural.heritage.service.book.BookingDateService; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +@Configuration +public class BookingDateConfig { + + @Resource + private BookingDateService bookingDateService; + + @Bean + public Boolean initBookingDate() { + System.out.println("这是Config"); + long count = bookingDateService.count(); + List bookingDateList = new ArrayList<>(); + if (count == 0) { + for (int i = 0; i < 3; i ++ ) { + BookingDate bookingDateRent = bookingDateService.initBookingDate(BookConstant.RENT_CLOTHES, i); + BookingDate bookingDateOwn = bookingDateService.initBookingDate(BookConstant.OWN_CLOTHES, i); + bookingDateList.add(bookingDateRent); + bookingDateList.add(bookingDateOwn); + } + boolean result = bookingDateService.saveBatch(bookingDateList); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + } + return true; + } +} diff --git a/src/main/java/com/cultural/heritage/constant/BookConstant.java b/src/main/java/com/cultural/heritage/constant/BookConstant.java new file mode 100644 index 0000000..a3af2f6 --- /dev/null +++ b/src/main/java/com/cultural/heritage/constant/BookConstant.java @@ -0,0 +1,11 @@ +package com.cultural.heritage.constant; + +public interface BookConstant { + + + String RENT_CLOTHES = "整套约拍"; + + + String OWN_CLOTHES = "自带服装"; + +} diff --git a/src/main/java/com/cultural/heritage/controller/book/AdvanceOrderController.java b/src/main/java/com/cultural/heritage/controller/book/AdvanceOrderController.java new file mode 100644 index 0000000..43ae5a8 --- /dev/null +++ b/src/main/java/com/cultural/heritage/controller/book/AdvanceOrderController.java @@ -0,0 +1,171 @@ +package com.cultural.heritage.controller.book; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cultural.heritage.annotation.AuthCheck; +import com.cultural.heritage.common.BaseResponse; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.common.ResultUtils; +import com.cultural.heritage.constant.UserConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.dto.advanceOrder.AdvanceOrderAddRequest; +import com.cultural.heritage.model.dto.advanceOrder.AdvanceOrderQueryRequest; +import com.cultural.heritage.model.dto.order.OrderUpdateRequest; +import com.cultural.heritage.model.dto.snapshot.ContactsSnapshot; +import com.cultural.heritage.model.entity.AdvanceOrder; +import com.cultural.heritage.model.entity.Contacts; +import com.cultural.heritage.model.entity.User; +import com.cultural.heritage.model.vo.advanceorder.AdvanceOrderVO; +import com.cultural.heritage.service.address.ContactsService; +import com.cultural.heritage.service.book.AdvanceOrderService; +import com.cultural.heritage.service.user.UserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/advanceOrder") +@Slf4j +@Tag(name = "写真预约订单管理模块") +public class AdvanceOrderController { + + + @Resource + private AdvanceOrderService advanceOrderService; + + + @Resource + private UserService userService; + + + @Resource + private ContactsService contactsService; + + + /** + * 小程序端用户创建写真预约订单 + * @param addAdvanceOrderRequest 写真预约订单添加请求体 + * @return 是否添加成功 + */ + @PostMapping("/add") + @Operation(summary = "小程序端用户创建写真预约订单", description = "参数：写真预约订单添加请求体, 权限：所有人，方法名：addAdvanceOrder") + public BaseResponse addAdvanceOrder(@RequestBody AdvanceOrderAddRequest addAdvanceOrderRequest, HttpServletRequest request) { + if (addAdvanceOrderRequest == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + // 获取用户id + User loginUser = userService.getLoginUser(request); + Long userId = loginUser.getId(); + // 获取联系人信息 + Long contactsId = addAdvanceOrderRequest.getContactsId(); + Contacts contacts = contactsService.getById(contactsId); + ContactsSnapshot contactsSnapshot = new ContactsSnapshot(); + BeanUtils.copyProperties(contacts, contactsSnapshot); + // 封装写真预约订单类 + AdvanceOrder advanceOrder = new AdvanceOrder(); + BeanUtils.copyProperties(addAdvanceOrderRequest, advanceOrder); + advanceOrder.setUserId(userId); + advanceOrder.setContactsSnapshot(contactsSnapshot); + // 校验 + advanceOrderService.validAdvanceOrder(advanceOrder); + boolean result = advanceOrderService.save(advanceOrder); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + + + /** + * Web端管理员查询写真预约订单 + * @param advanceOrderQueryRequest 写真预约订单查询请求体 + * @return 写真预约订单列表 + */ + @PostMapping("/list") + @Operation(summary = "Web端管理员查询写真预约订单", description = "参数：写真预约订单查询请求体, 权限：管理员(admin, boss)，方法名：listAdvanceOrderByPage") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + public BaseResponse> listAdvanceOrderByPage(@RequestBody AdvanceOrderQueryRequest advanceOrderQueryRequest) { + if (advanceOrderQueryRequest == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + long current = advanceOrderQueryRequest.getCurrent(); + long pageSize = advanceOrderQueryRequest.getPageSize(); + QueryWrapper queryWrapper = advanceOrderService.getQueryWrapper(advanceOrderQueryRequest); + Page page = advanceOrderService.page(new Page<>(current, pageSize), queryWrapper); + // 封装成写真预约订单VO + List records = page.getRecords(); + List advanceOrderVOS = records.stream().map(advanceOrder -> { + AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO(); + BeanUtils.copyProperties(advanceOrder, advanceOrderVO); + return advanceOrderVO; + }).toList(); + Page voPage = new Page<>(); + voPage.setRecords(advanceOrderVOS); + voPage.setTotal(page.getTotal()); + voPage.setPages(page.getSize()); + voPage.setCurrent(page.getCurrent()); + voPage.setSize(page.getSize()); + return ResultUtils.success(voPage); + } + + + + + /** + * 小程序端用户查询写真预约订单 + * @return 当前用户的订单列表 + */ + @PostMapping("/list/my") + @Operation(summary = "小程序端用户查询写真预约订单", description = "参数：无, 权限：所有人，方法名：listMyAdvanceOrder") + public BaseResponse> listMyAdvanceOrder(HttpServletRequest request) { + User loginUser = userService.getLoginUser(request); + Long userId = loginUser.getId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("userId", userId); + List advanceOrderList = advanceOrderService.list(queryWrapper); + // 封装成写真预约订单VO + List advanceOrderVOS = advanceOrderList.stream().map(advanceOrder -> { + AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO(); + BeanUtils.copyProperties(advanceOrder, advanceOrderVO); + return advanceOrderVO; + }).toList(); + return ResultUtils.success(advanceOrderVOS); + } + + + /** + * Web端管理员更新订单状态 + * @param orderUpdateRequest 订单状态更新请求体 + * @return 是否更新成功 + */ + @PostMapping("/update") + @Operation(summary = "Web端管理员更新订单状态", description = "参数：订单状态更新请求体，权限：管理员(admin, boss)， 方法名：updateAdvanceOrderStatus") + public BaseResponse updateAdvanceOrderStatus(@RequestBody OrderUpdateRequest orderUpdateRequest) { + if (orderUpdateRequest == null || orderUpdateRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = orderUpdateRequest.getId(); + String orderStatus = orderUpdateRequest.getOrderStatus(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("orderStatus", orderStatus); + boolean result = advanceOrderService.update(updateWrapper); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + +} diff --git a/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java b/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java new file mode 100644 index 0000000..f9f8a33 --- /dev/null +++ b/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java @@ -0,0 +1,113 @@ +package com.cultural.heritage.controller.book; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cultural.heritage.annotation.AuthCheck; +import com.cultural.heritage.common.BaseResponse; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.common.ResultUtils; +import com.cultural.heritage.constant.BookConstant; +import com.cultural.heritage.constant.UserConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.dto.CommonStringRequest; +import com.cultural.heritage.model.dto.book.BookingDateUpdateRequest; +import com.cultural.heritage.model.entity.BookingDate; +import com.cultural.heritage.model.vo.book.BookingDateVO; +import com.cultural.heritage.service.book.BookingDateService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping("/book") +@Slf4j +@Tag(name = "预约日期管理模块") +public class BookingDateController { + + + @Resource + private BookingDateService bookingDateService; + + + /** + * 初始化未来一天的预约日期 + */ +// @Scheduled(cron = "*/5 * * * * ?") + // 每天00:00-00:00调用 + @Scheduled(cron = "0 0 0 * * ?") + @Transactional(rollbackFor = Exception.class) + @GetMapping("/init") + @Operation(summary = "初始化未来一天的预约日期", description = "参数：无，权限：自动调用，方法名：initCurrentBookingDate") + public void initCurrentBookingDate() { + // 初始化预约日期 + List bookingDateList = new ArrayList<>(); + BookingDate bookingDateRent = bookingDateService.initBookingDate(BookConstant.RENT_CLOTHES, 3); + BookingDate bookingDateOwn = bookingDateService.initBookingDate(BookConstant.OWN_CLOTHES, 3); + bookingDateList.add(bookingDateRent); + bookingDateList.add(bookingDateOwn); + boolean result = bookingDateService.saveBatch(bookingDateList); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + } + + + + + /** + * 根据预约类别查询未来四天(包括今天)的预约日期 + * @param commonStringRequest 预约类型 + * @return 当前预约类型未来四天的预约日期列表 + */ + @PostMapping("/list") + @Operation(summary = "根据预约类别查询未来四天(包括今天)的预约日期", description = "参数：预约类型, 权限：所有人，方法名：listBookingDateByType") + public BaseResponse> listBookingDateByType(@RequestBody CommonStringRequest commonStringRequest) { + if (commonStringRequest == null || StringUtils.isBlank(commonStringRequest.getType())) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + String type = commonStringRequest.getType(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("type", type); + List bookingDateList = bookingDateService.list(queryWrapper); + // 封装预约日期VO + List bookingDateVOS = bookingDateList.stream().map(bookingDate -> { + BookingDateVO bookingDateVO = new BookingDateVO(); + BeanUtils.copyProperties(bookingDate, bookingDateVO); + return bookingDateVO; + }).toList(); + return ResultUtils.success(bookingDateVOS); + } + + + + /** + * 更新当天的预约情况 + * @param bookingDateUpdateRequest 预约日期更新请求体 + * @return 是否更新成功 + */ + @PostMapping("/update") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "更新当天的预约情况", description = "参数：预约日期更新请求体, 权限：管理员(admin, boss)，方法名：updateBookingDate") + public BaseResponse updateBookingDate(@RequestBody BookingDateUpdateRequest bookingDateUpdateRequest) { + if (bookingDateUpdateRequest == null || bookingDateUpdateRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + BookingDate bookingDate = new BookingDate(); + BeanUtils.copyProperties(bookingDateUpdateRequest, bookingDate); + boolean result = bookingDateService.updateById(bookingDate); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + + +} diff --git a/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java b/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java new file mode 100644 index 0000000..cced148 --- /dev/null +++ b/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java @@ -0,0 +1,120 @@ +package com.cultural.heritage.controller.book; + + +import com.cultural.heritage.annotation.AuthCheck; +import com.cultural.heritage.common.BaseResponse; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.common.ResultUtils; +import com.cultural.heritage.constant.UserConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.dto.CommonRequest; +import com.cultural.heritage.model.dto.clothesgrade.ClothesGradeAddRequest; +import com.cultural.heritage.model.dto.clothesgrade.ClothesGradeUpdateRequest; +import com.cultural.heritage.model.entity.ClothesGrade; +import com.cultural.heritage.model.vo.clothesgrade.ClothesGradeVO; +import com.cultural.heritage.service.book.ClothesGradeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/clothesGrade") +@Slf4j +@Tag(name = "服装等级管理模块") +public class ClothesGradeController { + + + @Resource + private ClothesGradeService clothesGradeService; + + + /** + * 添加服装等级 + * @param clothesGradeAddRequest 服装等级添加请求体 + * @return 是否添加成功 + */ + @PostMapping("/add") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web端管理员添加服装等级", description = "参数：服装等级添加请求体，权限：管理员(admin, boss)，方法名：addClothesGrade") + public BaseResponse addClothesGrade(@RequestBody ClothesGradeAddRequest clothesGradeAddRequest) { + if (clothesGradeAddRequest == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + ClothesGrade clothesGrade = new ClothesGrade(); + BeanUtils.copyProperties(clothesGradeAddRequest, clothesGrade); + clothesGradeService.validClothesGrade(clothesGrade, false); + boolean save = clothesGradeService.save(clothesGrade); + ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(clothesGrade.getId()); + } + + + + /** + * 更新服装等级 + * @param clothesGradeUpdateRequest 服装等级更新请求体 + * @return 是否更新成功 + */ + @PostMapping("/update") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web端管理员更新服装等级", description = "参数：服装等级更新请求体，权限：管理员(admin, boss)，方法名：updateClothesGrade") + public BaseResponse updateClothesGrade(@RequestBody ClothesGradeUpdateRequest clothesGradeUpdateRequest) { + if (clothesGradeUpdateRequest == null || clothesGradeUpdateRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + ClothesGrade clothesGrade = new ClothesGrade(); + BeanUtils.copyProperties(clothesGradeUpdateRequest, clothesGrade); + clothesGradeService.validClothesGrade(clothesGrade, true); + boolean result = clothesGradeService.updateById(clothesGrade); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + /** + * 删除服装等级 + * @param commonRequest 服装等级删除请求体 + * @return 是否删除成功 + */ + @PostMapping("/delete") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web端管理员删除服装等级", description = "参数：服装等级删除请求体，权限：管理员(admin, boss)，方法名：deleteClothesGrade") + public BaseResponse deleteClothesGrade(@RequestBody CommonRequest commonRequest) { + if (commonRequest == null || commonRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = commonRequest.getId(); + // 删除等级服装之前，先删除该等级服装下的所有商品 + clothesGradeService.deleteCurrentAllClothes(id); + boolean result = clothesGradeService.removeById(id); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + /** + * 查询所有服装等级 + * @return 服装等级列表 + */ + @PostMapping("/list") + @Operation(summary = "Web端和小程序端查询服装等级", description = "参数：无，权限：所有人，方法名：listClothesGrade") + public BaseResponse> listClothesGrade() { + List clothesGradeList = clothesGradeService.list(); + List clothesGradeVOS = clothesGradeList.stream().map(clothesGrade -> { + ClothesGradeVO clothesGradeVO = new ClothesGradeVO(); + BeanUtils.copyProperties(clothesGrade, clothesGradeVO); + return clothesGradeVO; + }).toList(); + return ResultUtils.success(clothesGradeVOS); + } + +} diff --git a/src/main/java/com/cultural/heritage/controller/book/ClothesInfoController.java b/src/main/java/com/cultural/heritage/controller/book/ClothesInfoController.java new file mode 100644 index 0000000..8627448 --- /dev/null +++ b/src/main/java/com/cultural/heritage/controller/book/ClothesInfoController.java @@ -0,0 +1,197 @@ +package com.cultural.heritage.controller.book; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cultural.heritage.annotation.AuthCheck; +import com.cultural.heritage.common.BaseResponse; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.common.ResultUtils; +import com.cultural.heritage.constant.UserConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.model.dto.CommonRequest; +import com.cultural.heritage.model.dto.clothesinfo.ClothesInfoAddRequest; +import com.cultural.heritage.model.dto.clothesinfo.ClothesInfoQueryRequest; +import com.cultural.heritage.model.dto.clothesinfo.ClothesInfoUpdateRequest; +import com.cultural.heritage.model.entity.ClothesGrade; +import com.cultural.heritage.model.entity.ClothesInfo; +import com.cultural.heritage.model.vo.clothesinfo.ClothesInfoLabelVO; +import com.cultural.heritage.model.vo.clothesinfo.ClothesInfoVO; +import com.cultural.heritage.service.book.ClothesGradeService; +import com.cultural.heritage.service.book.ClothesInfoService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/clothesInfo") +@Slf4j +@Tag(name = "服装信息管理模块") +public class ClothesInfoController { + + + @Resource + private ClothesInfoService clothesInfoService; + + + @Resource + private ClothesGradeService clothesGradeService; + + /** + * 添加服装 + * @param clothesInfoAddRequest 服装添加请求体 + * @return 服装的id + */ + @PostMapping("/add") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web端管理员添加服装", description = "参数：服装添加请求体，权限：管理员(admin, boss)，方法名：addClothesInfo") + public BaseResponse addClothesInfo(@RequestBody ClothesInfoAddRequest clothesInfoAddRequest) { + if (clothesInfoAddRequest == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + ClothesInfo clothesInfo = new ClothesInfo(); + BeanUtils.copyProperties(clothesInfoAddRequest, clothesInfo); + // 校验 + clothesInfoService.validClothesInfo(clothesInfo, false); + boolean result = clothesInfoService.save(clothesInfo); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(clothesInfo.getId()); + } + + + + + /** + * 更新服装 + * @param clothesInfoUpdateRequest 服装更新请求体 + * @return 是否更新成功 + */ + @PostMapping("/update") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web管理员更新服装", description = "参数：服装更新请求体，权限：管理员(admin, boss)，方法名：updateClothesInfo") + public BaseResponse updateClothesInfo(@RequestBody ClothesInfoUpdateRequest clothesInfoUpdateRequest) { + if (clothesInfoUpdateRequest == null || clothesInfoUpdateRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + ClothesInfo clothesInfo = new ClothesInfo(); + BeanUtils.copyProperties(clothesInfoUpdateRequest, clothesInfo); + // 校验 + clothesInfoService.validClothesInfo(clothesInfo, true); + boolean result = clothesInfoService.updateById(clothesInfo); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + /** + * 删除服装 + * @param commonRequest 服装删除请求体 + * @return 是否删除成功 + */ + @PostMapping("/delete") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web管理员删除服装", description = "参数：服装删除请求体，权限：管理员(admin, boss)，方法名：deleteClothesInfo") + public BaseResponse deleteClothesInfo(@RequestBody CommonRequest commonRequest) { + if (commonRequest == null || commonRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = commonRequest.getId(); + boolean result = clothesInfoService.removeById(id); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + return ResultUtils.success(true); + } + + + + /** + * 分页查询服装列表 + * @param clothesInfoQueryRequest 服装查询请求体 + * @return 服装列表 + */ + @PostMapping("/list/page") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Operation(summary = "Web管理员分页查询服装", description = "参数：服装删除请求体，权限：管理员(admin, boss)，方法名：deleteClothesInfo") + public BaseResponse> listClothesInfoByPage(@RequestBody ClothesInfoQueryRequest clothesInfoQueryRequest) { + if (clothesInfoQueryRequest == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + long current = clothesInfoQueryRequest.getCurrent(); + long pageSize = clothesInfoQueryRequest.getPageSize(); + QueryWrapper queryWrapper = clothesInfoService.getQueryWrapper(clothesInfoQueryRequest); + Page page = clothesInfoService.page(new Page<>(current, pageSize), queryWrapper); + // 封装服装类VO + List records = page.getRecords(); + List clothesInfoVOS = records.stream().map(clothesInfo -> { + ClothesInfoVO clothesInfoVO = new ClothesInfoVO(); + BeanUtils.copyProperties(clothesInfo, clothesInfoVO); + return clothesInfoVO; + }).toList(); + Page voPage = new Page<>(); + voPage.setRecords(clothesInfoVOS); + voPage.setTotal(page.getTotal()); + voPage.setCurrent(page.getCurrent()); + voPage.setSize(page.getSize()); + voPage.setPages(page.getPages()); + return ResultUtils.success(voPage); + } + + + + + /** + * 小程序端用户根据服装等级id查询服装标签 + * @param commonRequest 服装等级id + * @return 当前等级下的服装列表标签 + */ + @PostMapping("/list/label") + @Operation(summary = "小程序端用户根据服装等级id查询服装标签", description = "参数：服装等级id，权限：所有人，方法名：listClothesInfoLabel") + public BaseResponse> listClothesInfoLabel(@RequestBody CommonRequest commonRequest) { + if (commonRequest == null || commonRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = commonRequest.getId(); + ClothesGrade clothesGrade = clothesGradeService.getById(id); + String clothesType = clothesGrade.getClothesType(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("clothesType", clothesType); + List clothesInfoList = clothesInfoService.list(queryWrapper); + + List clothesInfoLabelVOS = clothesInfoList.stream().map(clothesInfo -> { + ClothesInfoLabelVO clothesInfoLabelVO = new ClothesInfoLabelVO(); + BeanUtils.copyProperties(clothesInfo, clothesInfoLabelVO); + return clothesInfoLabelVO; + }).toList(); + return ResultUtils.success(clothesInfoLabelVOS); + } + + + + /** + * 小程序端用户根据服装等级id查询服装详情 + * @param commonRequest 服装id + * @return 服装详情信息 + */ + @PostMapping("/list/detail") + @Operation(summary = "小程序端用户根据服装等级id查询服装详情", description = "参数：服装id，权限：所有人，方法名：getOneById") + public BaseResponse getOneById(@RequestBody CommonRequest commonRequest) { + if (commonRequest == null || commonRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = commonRequest.getId(); + ClothesInfo clothesInfo = clothesInfoService.getById(id); + ThrowUtils.throwIf(clothesInfo == null, ErrorCode.NOT_FOUND_ERROR, "该服装已被删除"); + ClothesInfoVO clothesInfoVO = new ClothesInfoVO(); + BeanUtils.copyProperties(clothesInfo, clothesInfoVO); + return ResultUtils.success(clothesInfoVO); + } + + + + +} diff --git a/src/main/java/com/cultural/heritage/controller/good/CategoryController.java b/src/main/java/com/cultural/heritage/controller/good/CategoryController.java index 2c7caa8..5ff3c8f 100644 --- a/src/main/java/com/cultural/heritage/controller/good/CategoryController.java +++ b/src/main/java/com/cultural/heritage/controller/good/CategoryController.java @@ -92,8 +92,11 @@ public class CategoryController { // 根据类别id获取商品删除的条件 QueryWrapper queryWrapper = categoryService.getDeleteQueryWrapper(id); List goodList = goodService.list(queryWrapper); - boolean isSuccess = goodService.removeBatchByIds(goodList); - ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); + // 如果该类别下有商品，就删除 + if (!CollectionUtils.isEmpty(goodList)) { + boolean isSuccess = goodService.removeBatchByIds(goodList); + ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); + } // 删除当前类别 boolean result = categoryService.removeById(id); ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); @@ -106,7 +109,7 @@ public class CategoryController { * @param commonDelBatchRequest 类别删除请求体 * @return 是否删除成功 */ - @PostMapping("/delBath") + @PostMapping("/delBatch") @Operation(summary = "Web端管理员批量删除商品类别", description = "参数：类别删除请求体，权限：管理员(admin, boss)，方法名：deleteCategory") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse delBatchCategory(@RequestBody CommonDelBatchRequest commonDelBatchRequest) { @@ -119,8 +122,11 @@ public class CategoryController { // 根据类别id获取商品删除的条件 QueryWrapper queryWrapper = categoryService.getDeleteQueryWrapper(id); List goodList = goodService.list(queryWrapper); - boolean isSuccess = goodService.removeBatchByIds(goodList); - ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); + // 如果该类别下有商品，就删除 + if (!CollectionUtils.isEmpty(goodList)) { + boolean isSuccess = goodService.removeBatchByIds(goodList); + ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); + } // 删除当前类别 boolean result = categoryService.removeById(id); ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); @@ -194,7 +200,4 @@ public class CategoryController { - - - } 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 5822661..800bf9f 100644 --- a/src/main/java/com/cultural/heritage/controller/order/OrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/OrderController.java @@ -165,7 +165,7 @@ public class OrderController { /** - * 更新用户订单状态 + * Web端管理员更新订单状态 * @param orderUpdateRequest 订单状态更新请求体 * @return 是否更新成功 */ diff --git a/src/main/java/com/cultural/heritage/mapper/AdvanceOrderMapper.java b/src/main/java/com/cultural/heritage/mapper/AdvanceOrderMapper.java new file mode 100644 index 0000000..b0cc564 --- /dev/null +++ b/src/main/java/com/cultural/heritage/mapper/AdvanceOrderMapper.java @@ -0,0 +1,7 @@ +package com.cultural.heritage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cultural.heritage.model.entity.AdvanceOrder; + +public interface AdvanceOrderMapper extends BaseMapper { +} diff --git a/src/main/java/com/cultural/heritage/mapper/BookingDateMapper.java b/src/main/java/com/cultural/heritage/mapper/BookingDateMapper.java new file mode 100644 index 0000000..87af8f4 --- /dev/null +++ b/src/main/java/com/cultural/heritage/mapper/BookingDateMapper.java @@ -0,0 +1,7 @@ +package com.cultural.heritage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cultural.heritage.model.entity.BookingDate; + +public interface BookingDateMapper extends BaseMapper { +} diff --git a/src/main/java/com/cultural/heritage/mapper/ClothesGradeMapper.java b/src/main/java/com/cultural/heritage/mapper/ClothesGradeMapper.java new file mode 100644 index 0000000..2156bc9 --- /dev/null +++ b/src/main/java/com/cultural/heritage/mapper/ClothesGradeMapper.java @@ -0,0 +1,7 @@ +package com.cultural.heritage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cultural.heritage.model.entity.ClothesGrade; + +public interface ClothesGradeMapper extends BaseMapper { +} diff --git a/src/main/java/com/cultural/heritage/mapper/ClothesInfoMapper.java b/src/main/java/com/cultural/heritage/mapper/ClothesInfoMapper.java new file mode 100644 index 0000000..2719e69 --- /dev/null +++ b/src/main/java/com/cultural/heritage/mapper/ClothesInfoMapper.java @@ -0,0 +1,7 @@ +package com.cultural.heritage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cultural.heritage.model.entity.ClothesInfo; + +public interface ClothesInfoMapper extends BaseMapper { +} diff --git a/src/main/java/com/cultural/heritage/model/dto/CommonStringRequest.java b/src/main/java/com/cultural/heritage/model/dto/CommonStringRequest.java new file mode 100644 index 0000000..9db5de3 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/CommonStringRequest.java @@ -0,0 +1,23 @@ +package com.cultural.heritage.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "根据预约类型查询", requiredProperties = {"type"}) +public class CommonStringRequest implements Serializable { + + + /** + * 预约类型 + */ + @Schema(description = "预约类型", example = "整套约拍") + private String type; + + + @Serial + private static final long serialVersionUID = 1L; +} 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 new file mode 100644 index 0000000..70f67c0 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderAddRequest.java @@ -0,0 +1,88 @@ +package com.cultural.heritage.model.dto.advanceOrder; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "预约订单添加请求体", requiredProperties = {"type", "clothesType", "deposit", "contactsSnapshot", + "specificDate", "timeSlot", "isIndoors", "isMakeup", "isPhotography"}) +public class AdvanceOrderAddRequest implements Serializable { + + + /** + * 预约类别 + */ + @Schema(description = "预约类别", example = "整套约拍") + private String type; + + + /** + * 服装类别名称 + */ + @Schema(description = "服装类别名称", example = "时尚精选") + private String clothesType; + + + /** + * 定金 + */ + @Schema(description = "定金", example = "100.00") + private Double deposit; + + + /** + * 联系人id + */ + @Schema(description = "联系人id(id > 0)", example = "3") + private Long contactsId; + + + /** + * 预约具体日期 + */ + @Schema(description = "预约具体日期", example = "2024-11-18") + private String specificDate; + + + /** + * 预约时间段 + */ + @Schema(description = "预约时间段", example = "8:00-10:00") + private String timeSlot; + + + /** + * 是否是室内 + */ + @Schema(description = "是否是室内", example = "1") + private Integer isIndoors; + + + /** + * 是否选择妆发服务 + */ + @Schema(description = "是否选择妆发服务", example = "1") + private Integer isMakeup; + + + /** + * 是否选择摄影服务 + */ + @Schema(description = "是否选择摄影服务", example = "1") + private Integer isPhotography; + + + /** + * 订单状态 + */ + @Schema(description = "订单状态", example = "待付款") + private String orderStatus; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderQueryRequest.java b/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderQueryRequest.java new file mode 100644 index 0000000..391e1b7 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/advanceOrder/AdvanceOrderQueryRequest.java @@ -0,0 +1,84 @@ +package com.cultural.heritage.model.dto.advanceOrder; + +import com.cultural.heritage.common.PageRequest; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; + + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "预约订单查询请求体", requiredProperties = {"id", "type", "minDeposit", "maxDeposit", "startTime", "endTime", "orderStatus"}) +public class AdvanceOrderQueryRequest extends PageRequest implements Serializable { + + /** + * 写真预约订单id + */ + @Schema(description = "写真预约订单id", example = "2") + private Long id; + + + /** + * 预约类别 + */ + @Schema(description = "预约类别", example = "整套约拍") + private String type; + + + /** + * 最小定金 + */ + @Schema(description = "最小定金", example = "80") + private Double minDeposit; + + + /** + * 最大定金 + */ + @Schema(description = "最大定金", example = "200") + private Double maxDeposit; + + + /** + * 预约日期左区间 + */ + @Schema(description = "预约日期左区间", example = "2024-11-10") + private String startTime; + + + /** + * 预约日期右区间 + */ + @Schema(description = "预约日期右区间", example = "2024-11-18") + private String endTime; + + + /** + * 订单状态 + */ + @Schema(description = "订单状态", example = "待消费") + private String orderStatus; + + + /** + * 订单创建时间左区间 + */ + @Schema(description = "订单创建时间左区间", example = "2024-11-19 15:00:00") + private String createLeftTime; + + + + /** + * 订单创建时间右区间 + */ + @Schema(description = "订单创建时间右区间", example = "2024-11-20 13:00:00") + private String createRightTime; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/book/BookingDateAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/book/BookingDateAddRequest.java new file mode 100644 index 0000000..495f8b8 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/book/BookingDateAddRequest.java @@ -0,0 +1,50 @@ +package com.cultural.heritage.model.dto.book; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "预约日期添加请求体", requiredProperties = {"specificDate", "timeSlot", "isAvailable", "maxNumber", "type"}) +public class BookingDateAddRequest implements Serializable { + + /** + * 预约具体日期 + */ + @Schema(description = "预约具体日期", example = "2024-11-18") + private String specificDate; + + + /** + * 时间段 + */ + @Schema(description = "时间段", example = "8:00-10:00;12:00-14:00") + private String timeSlot; + + + /** + * 是否可预约 + */ + @Schema(description = "是否可预约", example = "1") + private Integer isAvailable; + + + /** + * 各个时间段的最大预约人数(4,6..) + */ + @Schema(description = "各个时间段的最大预约人数(4,6..)", example = "4,5,6") + private String maxNumber; + + + /** + * 预约类别 + */ + @Schema(description = "预约类别", example = "整套约拍") + private String type; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/book/BookingDateUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/book/BookingDateUpdateRequest.java new file mode 100644 index 0000000..c0c16a3 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/book/BookingDateUpdateRequest.java @@ -0,0 +1,58 @@ +package com.cultural.heritage.model.dto.book; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "预约日期更新请求体", requiredProperties = {"id", "specificDate", "timeSlot", "isAvailable", "maxNumber","type"}) +public class BookingDateUpdateRequest implements Serializable { + + + /** + * 预约日期id + */ + @Schema(description = "预约日期id", example = "1") + private Long id; + + + /** + * 预约具体日期 + */ + @Schema(description = "预约具体日期", example = "2024-11-18") + private String specificDate; + + + /** + * 时间段 + */ + @Schema(description = "时间段", example = "8:00-10:00;12:00-14:00") + private String timeSlot; + + + /** + * 是否可预约 + */ + @Schema(description = "是否可预约", example = "1") + private Integer isAvailable; + + + /** + * 各个时间段的最大预约人数(4,6..) + */ + @Schema(description = "各个时间段的最大预约人数(4,6..)", example = "4,5,6") + private String maxNumber; + + + /** + * 预约类别 + */ + @Schema(description = "预约类别", example = "整套约拍") + private String type; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeAddRequest.java new file mode 100644 index 0000000..6688ed9 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeAddRequest.java @@ -0,0 +1,50 @@ +package com.cultural.heritage.model.dto.clothesgrade; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "服装等级添加请求体", requiredProperties = {"clothesType", "image", "minPrice", "maxPrice", "brief"}) +public class ClothesGradeAddRequest implements Serializable { + + /** + * 类别名称 + */ + @Schema(description = "类别名称", example = "简约风尚") + private String clothesType; + + + /** + * 商品图片 + */ + @Schema(description = "商品图片", example = "http://xxx.png") + private String image; + + + /** + * 最低价格 + */ + @Schema(description = "最低价格", example = "80.00") + private Double minPrice; + + + /** + * 最高价格 + */ + @Schema(description = "最高价格", example = "160") + private Double maxPrice; + + + /** + * 服装价位简介 + */ + @Schema(description = "服装价位简介", example = "传承非遗之美，简约演绎经典") + private String brief; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeUpdateRequest.java new file mode 100644 index 0000000..3be7579 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/clothesgrade/ClothesGradeUpdateRequest.java @@ -0,0 +1,58 @@ +package com.cultural.heritage.model.dto.clothesgrade; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "服装等级更新请求体") +public class ClothesGradeUpdateRequest implements Serializable { + + + /** + * 服装等级id + */ + @Schema(description = "服装等级id", example = "2") + private Long id; + + + /** + * 类别名称 + */ + @Schema(description = "类别名称", example = "简约风尚") + private String clothesType; + + + /** + * 商品图片 + */ + @Schema(description = "商品图片", example = "http://xxx.png") + private String image; + + + /** + * 最低价格 + */ + @Schema(description = "最低价格", example = "80.00") + private Double minPrice; + + + /** + * 最高价格 + */ + @Schema(description = "最高价格", example = "160") + private Double maxPrice; + + + /** + * 服装价位简介 + */ + @Schema(description = "服装价位简介", example = "传承非遗之美，简约演绎经典") + private String brief; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoAddRequest.java new file mode 100644 index 0000000..b39ca4e --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoAddRequest.java @@ -0,0 +1,61 @@ +package com.cultural.heritage.model.dto.clothesinfo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +@Data +@Schema(description = "服装添加请求体", requiredProperties = {"name", "image", "effectImg", "intro", "price", "clothesType"}) +public class ClothesInfoAddRequest implements Serializable { + + + + /** + * 服装名称 + */ + @Schema(description = "服装名称", example = "彩绣菊花纹刺绣长袍") + private String name; + + + /** + * 服装图片 + */ + @Schema(description = "服装图片", example = "https://www.xxx.jpg") + private String image; + + + /** + * 服装效果图 + */ + @Schema(description = "服装效果图", example = "https://www.xxx.jpg;https://www.xxx.png") + private String effectImg; + + + /** + * 服装简介 + */ + @Schema(description = "服装简介", example = "用上等丝绸，质地细腻、柔软且富有光泽，触感极佳。统手工刺绣技艺，每一针每一线都凝聚着匠人的心血与智慧，") + private String intro; + + + /** + * 服装价格 + */ + @Schema(description = "服装价格", example = "100.00") + private Double price; + + + /** + * 所属服装等级 + */ + @Schema(description = "所属服装等级", example = "简约风尚") + private String clothesType; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoQueryRequest.java b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoQueryRequest.java new file mode 100644 index 0000000..6e36caf --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoQueryRequest.java @@ -0,0 +1,55 @@ +package com.cultural.heritage.model.dto.clothesinfo; + +import com.cultural.heritage.common.PageRequest; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "服装查询请求体", requiredProperties = {"current", "pageSize", "sortField"}) +public class ClothesInfoQueryRequest extends PageRequest implements Serializable { + + + /** + * 服装id + */ + @Schema(description = "服装id", example = "2") + private Long id; + + + /** + * 服装名称 + */ + @Schema(description = "服装名称", example = "彩绣菊花纹刺绣长袍") + private String name; + + + /** + * 最低价格 + */ + @Schema(description = "最低价格", example = "100.00") + private Double minPrice; + + + /** + * 最高价格 + */ + @Schema(description = "最高价格", example = "200.00") + private Double maxPrice; + + + /** + * 所属服装等级 + */ + @Schema(description = "所属服装等级", example = "简约风尚") + private String clothesType; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoUpdateRequest.java new file mode 100644 index 0000000..c29e5d8 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/clothesinfo/ClothesInfoUpdateRequest.java @@ -0,0 +1,66 @@ +package com.cultural.heritage.model.dto.clothesinfo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "服装添加请求体", requiredProperties = {"id", "name", "image", "effectImg", "intro", "price", "clothesType"}) +public class ClothesInfoUpdateRequest implements Serializable { + + + /** + * 服装id + */ + @Schema(description = "服装id", example = "1") + private Long id; + + + /** + * 服装名称 + */ + @Schema(description = "服装名称", example = "彩绣菊花纹刺绣长袍") + private String name; + + + /** + * 服装图片 + */ + @Schema(description = "服装图片", example = "https://www.xxx.jpg") + private String image; + + + /** + * 服装效果图 + */ + @Schema(description = "服装效果图", example = "https://www.xxx.jpg;https://www.xxx.png") + private String effectImg; + + + /** + * 服装简介 + */ + @Schema(description = "服装简介", example = "用上等丝绸，质地细腻、柔软且富有光泽，触感极佳。统手工刺绣技艺，每一针每一线都凝聚着匠人的心血与智慧，") + private String intro; + + + /** + * 服装价格 + */ + @Schema(description = "服装价格", example = "100.00") + private Double price; + + + /** + * 所属服装等级 + */ + @Schema(description = "所属服装等级", example = "简约风尚") + private String clothesType; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/good/GoodAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/GoodAddRequest.java index f06069c..65a977f 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/GoodAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/GoodAddRequest.java @@ -72,6 +72,7 @@ public class GoodAddRequest implements Serializable { @Schema(description = "节日序号(1代表端午节，2代表中秋节...)", example = "2") private Integer festivalOrder; + @TableField(exist = false) private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java index f15950f..de58570 100644 --- a/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/order/OrderAddRequest.java @@ -22,13 +22,6 @@ public class OrderAddRequest implements Serializable { @Schema(description = "订单类别", example = "product") private String orderType; -// -// /** -// * 用户id -// */ -// @Schema(description = "用户id(id > 0)", example = "2") -// private Long userId; - /** * 用户昵称 diff --git a/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java b/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java new file mode 100644 index 0000000..f809eb0 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/entity/AdvanceOrder.java @@ -0,0 +1,115 @@ +package com.cultural.heritage.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.cultural.heritage.model.dto.snapshot.ContactsSnapshot; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 预约类订单表 + * @TableName advance_order + */ +@Data +@TableName(value = "advance_order", autoResultMap = true) +public class AdvanceOrder implements Serializable { + + /** + * 写真预约订单id + */ + @TableId(type = IdType.AUTO) + private Long id; + + + /** + * 预约类别 + */ + private String type; + + + /** + * 服装类别名称 + */ + private String clothesType; + + + /** + * 定金 + */ + private Double deposit; + + + /** + * 联系人信息快照 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private ContactsSnapshot contactsSnapshot; + + + /** + * 预约具体日期 + */ + private String specificDate; + + + /** + * 预约时间段 + */ + private String timeSlot; + + + /** + * 是否是室内 + */ + private Integer isIndoors; + + + /** + * 是否选择妆发服务 + */ + private Integer isMakeup; + + + /** + * 是否选择摄影服务 + */ + private Integer isPhotography; + + + /** + * 用户id + */ + private Long userId; + + + /** + * 订单状态 + */ + private String orderStatus; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 是否删除 + */ + private Integer isDelete; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/entity/BookingDate.java b/src/main/java/com/cultural/heritage/model/entity/BookingDate.java new file mode 100644 index 0000000..65c9f08 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/entity/BookingDate.java @@ -0,0 +1,77 @@ +package com.cultural.heritage.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 预约日期表 + * @TableName booking_date + */ + +@Data +@TableName("booking_date") +public class BookingDate implements Serializable { + + /** + * 预约日期表 + */ + @TableId(type = IdType.AUTO) + private Long id; + + + /** + * 预约具体日期 + */ + private String specificDate; + + + /** + * 时间段 + */ + private String timeSlot; + + + /** + * 是否可预约 + */ + private Integer isAvailable; + + + /** + * 各个时间段的最大预约人数(4,6..) + */ + private String maxNumber; + + + /** + * 预约类别 + */ + private String type; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 是否删除 + */ + private Integer isDelete; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/entity/ClothesGrade.java b/src/main/java/com/cultural/heritage/model/entity/ClothesGrade.java new file mode 100644 index 0000000..a5df2db --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/entity/ClothesGrade.java @@ -0,0 +1,77 @@ +package com.cultural.heritage.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 服装等级 + * @TableName clothes_grade + */ + +@Data +@TableName("clothes_grade") +public class ClothesGrade implements Serializable { + + + /** + * 服装等级id + */ + @TableId(type = IdType.AUTO) + private Long id; + + + /** + * 类别名称 + */ + private String clothesType; + + + /** + * 商品图片 + */ + private String image; + + + /** + * 最低价格 + */ + private Double minPrice; + + + /** + * 最高价格 + */ + private Double maxPrice; + + + /** + * 服装价位简介 + */ + private String brief; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 是否删除 + */ + private Integer isDelete; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/entity/ClothesInfo.java b/src/main/java/com/cultural/heritage/model/entity/ClothesInfo.java new file mode 100644 index 0000000..c2dda06 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/entity/ClothesInfo.java @@ -0,0 +1,83 @@ +package com.cultural.heritage.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 服装信息表 + * @TableName clothes_info + */ + +@Data +@TableName("clothes_info") +public class ClothesInfo implements Serializable { + + + /** + * 服装id + */ + @TableId(type = IdType.AUTO) + private Long id; + + + /** + * 服装名称 + */ + private String name; + + + /** + * 服装图片 + */ + private String image; + + + /** + * 服装效果图 + */ + private String effectImg; + + + /** + * 服装简介 + */ + private String intro; + + + /** + * 服装价格 + */ + private Double price; + + + /** + * 所属服装等级 + */ + private String clothesType; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 是否删除 + */ + private Integer isDelete; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/entity/User.java b/src/main/java/com/cultural/heritage/model/entity/User.java index 7d90036..6b5f61a 100644 --- a/src/main/java/com/cultural/heritage/model/entity/User.java +++ b/src/main/java/com/cultural/heritage/model/entity/User.java @@ -17,6 +17,9 @@ import java.util.Date; */ @TableName(value = "user") @Data +//@Builder +//@AllArgsConstructor +//@NoArgsConstructor public class User implements Serializable { /** * 用户编号 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 new file mode 100644 index 0000000..bc719ac --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/advanceorder/AdvanceOrderVO.java @@ -0,0 +1,97 @@ +package com.cultural.heritage.model.vo.advanceorder; + +import com.cultural.heritage.model.dto.snapshot.ContactsSnapshot; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +@Data +public class AdvanceOrderVO implements Serializable { + + + /** + * 写真预约订单id + */ + private Long id; + + + /** + * 预约类别 + */ + private String type; + + + /** + * 服装类别名称 + */ + private String clothesType; + + + /** + * 定金 + */ + private Double deposit; + + + /** + * 联系人信息快照 + */ + private ContactsSnapshot contactsSnapshot; + + + /** + * 预约具体日期 + */ + private String specificDate; + + + /** + * 预约时间段 + */ + private String timeSlot; + + + /** + * 是否是室内 + */ + private Integer isIndoors; + + + /** + * 是否选择妆发服务 + */ + private Integer isMakeup; + + + /** + * 是否选择摄影服务 + */ + private Integer isPhotography; + + + /** + * 用户id + */ + private Long userId; + + + /** + * 订单状态 + */ + private String orderStatus; + + + /** + * 创建时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/book/BookingDateVO.java b/src/main/java/com/cultural/heritage/model/vo/book/BookingDateVO.java new file mode 100644 index 0000000..9be66ed --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/book/BookingDateVO.java @@ -0,0 +1,52 @@ +package com.cultural.heritage.model.vo.book; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class BookingDateVO implements Serializable { + + + /** + * 预约日期表 + */ + private Long id; + + + /** + * 预约具体日期 + */ + private String specificDate; + + + /** + * 时间段 + */ + private String timeSlot; + + + /** + * 是否可预约 + */ + private Integer isAvailable; + + + /** + * 各个时间段的最大预约人数(4,6..) + */ + private String maxNumber; + + + /** + * 预约类别 + */ + private String type; + + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/clothesgrade/ClothesGradeVO.java b/src/main/java/com/cultural/heritage/model/vo/clothesgrade/ClothesGradeVO.java new file mode 100644 index 0000000..f7a8179 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/clothesgrade/ClothesGradeVO.java @@ -0,0 +1,51 @@ +package com.cultural.heritage.model.vo.clothesgrade; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class ClothesGradeVO implements Serializable { + + + /** + * 服装等级id + */ + private Long id; + + + /** + * 类别名称 + */ + private String clothesType; + + + /** + * 商品图片 + */ + private String image; + + + /** + * 最低价格 + */ + private Double minPrice; + + + /** + * 最高价格 + */ + private Double maxPrice; + + + /** + * 服装价位简介 + */ + private String brief; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoLabelVO.java b/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoLabelVO.java new file mode 100644 index 0000000..7ec8c79 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoLabelVO.java @@ -0,0 +1,44 @@ +package com.cultural.heritage.model.vo.clothesinfo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class ClothesInfoLabelVO implements Serializable { + + /** + * 服装id + */ + private Long id; + + + /** + * 服装名称 + */ + private String name; + + + /** + * 服装图片 + */ + private String image; + + + /** + * 服装简介 + */ + private String intro; + + + /** + * 服装价格 + */ + private Double price; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoVO.java b/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoVO.java new file mode 100644 index 0000000..341c012 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/clothesinfo/ClothesInfoVO.java @@ -0,0 +1,56 @@ +package com.cultural.heritage.model.vo.clothesinfo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class ClothesInfoVO implements Serializable { + + + /** + * 服装id + */ + private Long id; + + + /** + * 服装名称 + */ + private String name; + + + /** + * 服装图片 + */ + private String image; + + + /** + * 服装效果图 + */ + private String effectImg; + + + /** + * 服装简介 + */ + private String intro; + + + /** + * 服装价格 + */ + private Double price; + + + /** + * 所属服装等级 + */ + private String clothesType; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/service/address/impl/AddressServiceImpl.java b/src/main/java/com/cultural/heritage/service/address/impl/AddressServiceImpl.java index 7ebc291..48b7ea7 100644 --- a/src/main/java/com/cultural/heritage/service/address/impl/AddressServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/address/impl/AddressServiceImpl.java @@ -12,6 +12,7 @@ import com.cultural.heritage.utils.RegexUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; @@ -23,7 +24,7 @@ public class AddressServiceImpl extends ServiceImpl impl Integer isDefault = address.getIsDefault(); Long userId = address.getUserId(); List
list = this.getUserAddressById(userId); - if (list.size() == 0) { + if (CollectionUtils.isEmpty(list)) { return ; } if (isDefault == 1) { diff --git a/src/main/java/com/cultural/heritage/service/address/impl/ContactsServiceImpl.java b/src/main/java/com/cultural/heritage/service/address/impl/ContactsServiceImpl.java index ebd4882..7d80f50 100644 --- a/src/main/java/com/cultural/heritage/service/address/impl/ContactsServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/address/impl/ContactsServiceImpl.java @@ -12,6 +12,7 @@ import com.cultural.heritage.utils.RegexUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; @@ -24,6 +25,9 @@ public class ContactsServiceImpl extends ServiceImpl i Integer isDefault = contacts.getIsDefault(); Long userId = contacts.getUserId(); List list = this.getUserContactsById(userId); + if (CollectionUtils.isEmpty(list)) { + return ; + } if (isDefault == 1) { list.forEach(item -> item.setIsDefault(0)); } diff --git a/src/main/java/com/cultural/heritage/service/book/AdvanceOrderService.java b/src/main/java/com/cultural/heritage/service/book/AdvanceOrderService.java new file mode 100644 index 0000000..7d9236f --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/AdvanceOrderService.java @@ -0,0 +1,20 @@ +package com.cultural.heritage.service.book; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.cultural.heritage.model.dto.advanceOrder.AdvanceOrderQueryRequest; +import com.cultural.heritage.model.entity.AdvanceOrder; + +public interface AdvanceOrderService extends IService { + + /** + * 校验 + */ + void validAdvanceOrder(AdvanceOrder advanceOrder); + + + /** + * 获取查询条件 + */ + QueryWrapper getQueryWrapper(AdvanceOrderQueryRequest advanceOrderQueryRequest); +} diff --git a/src/main/java/com/cultural/heritage/service/book/BookingDateService.java b/src/main/java/com/cultural/heritage/service/book/BookingDateService.java new file mode 100644 index 0000000..dc59c56 --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/BookingDateService.java @@ -0,0 +1,13 @@ +package com.cultural.heritage.service.book; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cultural.heritage.model.entity.BookingDate; + +public interface BookingDateService extends IService { + + + /** + * 初始化未来一天的预约日期 + */ + BookingDate initBookingDate(String type, int offset); +} diff --git a/src/main/java/com/cultural/heritage/service/book/ClothesGradeService.java b/src/main/java/com/cultural/heritage/service/book/ClothesGradeService.java new file mode 100644 index 0000000..fd9776d --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/ClothesGradeService.java @@ -0,0 +1,19 @@ +package com.cultural.heritage.service.book; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cultural.heritage.model.entity.ClothesGrade; + +public interface ClothesGradeService extends IService { + + + /** + * 校验 + */ + void validClothesGrade(ClothesGrade clothesGrade, boolean update); + + + /** + * 删除当前服装等级下的所有服装 + */ + void deleteCurrentAllClothes(Long id); +} diff --git a/src/main/java/com/cultural/heritage/service/book/ClothesInfoService.java b/src/main/java/com/cultural/heritage/service/book/ClothesInfoService.java new file mode 100644 index 0000000..cfddf52 --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/ClothesInfoService.java @@ -0,0 +1,20 @@ +package com.cultural.heritage.service.book; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.cultural.heritage.model.dto.clothesinfo.ClothesInfoQueryRequest; +import com.cultural.heritage.model.entity.ClothesInfo; + +public interface ClothesInfoService extends IService { + + /** + * 校验 + */ + void validClothesInfo(ClothesInfo clothesInfo, boolean update); + + + /** + * 获取查询条件 + */ + QueryWrapper getQueryWrapper(ClothesInfoQueryRequest clothesInfoQueryRequest); +} 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 new file mode 100644 index 0000000..27d4dea --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/impl/AdvanceOrderServiceImpl.java @@ -0,0 +1,92 @@ +package com.cultural.heritage.service.book.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.constant.BookConstant; +import com.cultural.heritage.constant.CommonConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.mapper.AdvanceOrderMapper; +import com.cultural.heritage.model.dto.advanceOrder.AdvanceOrderQueryRequest; +import com.cultural.heritage.model.dto.snapshot.ContactsSnapshot; +import com.cultural.heritage.model.entity.AdvanceOrder; +import com.cultural.heritage.service.book.AdvanceOrderService; +import com.cultural.heritage.utils.SqlUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +@Service +public class AdvanceOrderServiceImpl extends ServiceImpl implements AdvanceOrderService { + + + /** + * 校验 + */ + @Override + public void validAdvanceOrder(AdvanceOrder advanceOrder) { + String type = advanceOrder.getType(); + String clothesType = advanceOrder.getClothesType(); + Double deposit = advanceOrder.getDeposit(); + ContactsSnapshot contactsSnapshot = advanceOrder.getContactsSnapshot(); + String specificDate = advanceOrder.getSpecificDate(); + String timeSlot = advanceOrder.getTimeSlot(); + Integer isIndoors = advanceOrder.getIsIndoors(); + Integer isMakeup = advanceOrder.getIsMakeup(); + Integer isPhotography = advanceOrder.getIsPhotography(); + String orderStatus = advanceOrder.getOrderStatus(); + Long userId = advanceOrder.getUserId(); + + if (ObjectUtils.isEmpty(deposit) || deposit <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "定金参数错误"); + } + if (ObjectUtils.anyNull(contactsSnapshot, isIndoors, isMakeup, isPhotography, 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(type, clothesType, specificDate, timeSlot, orderStatus)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "存在参数为空"); + } + if (!type.equals(BookConstant.RENT_CLOTHES) && !type.equals(BookConstant.OWN_CLOTHES)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "预约类型参数错误"); + } + if (type.equals(BookConstant.RENT_CLOTHES)) { + if (isMakeup != 1 || isPhotography != 1) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "是否妆发或是否摄影参数错误"); + } + } + } + + + /** + * 获取查询条件 + */ + @Override + public QueryWrapper getQueryWrapper(AdvanceOrderQueryRequest advanceOrderQueryRequest) { + Long id = advanceOrderQueryRequest.getId(); + String type = advanceOrderQueryRequest.getType(); + Double minDeposit = advanceOrderQueryRequest.getMinDeposit(); + Double maxDeposit = advanceOrderQueryRequest.getMaxDeposit(); + String startTime = advanceOrderQueryRequest.getStartTime(); + String endTime = advanceOrderQueryRequest.getEndTime(); + String orderStatus = advanceOrderQueryRequest.getOrderStatus(); + String sortField = advanceOrderQueryRequest.getSortField(); + String sortOrder = advanceOrderQueryRequest.getSortOrder(); + String createLeftTime = advanceOrderQueryRequest.getCreateLeftTime(); + String createRightTime = advanceOrderQueryRequest.getCreateRightTime(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(id != null, "id", id); + queryWrapper.eq(StringUtils.isNotBlank(type), "type", type); + queryWrapper.ge(ObjectUtils.isNotEmpty(minDeposit), "deposit", minDeposit); + queryWrapper.le(ObjectUtils.isNotEmpty(maxDeposit), "deposit", maxDeposit); + queryWrapper.between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), "specificDate", startTime, endTime); + queryWrapper.between(StringUtils.isNotBlank(createLeftTime) && StringUtils.isNotBlank(createRightTime), "createTime", createLeftTime, createRightTime); + queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus); + queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC), + sortField); + return queryWrapper; + } +} diff --git a/src/main/java/com/cultural/heritage/service/book/impl/BookingDateServiceImpl.java b/src/main/java/com/cultural/heritage/service/book/impl/BookingDateServiceImpl.java new file mode 100644 index 0000000..541fa81 --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/impl/BookingDateServiceImpl.java @@ -0,0 +1,28 @@ +package com.cultural.heritage.service.book.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cultural.heritage.mapper.BookingDateMapper; +import com.cultural.heritage.model.entity.BookingDate; +import com.cultural.heritage.service.book.BookingDateService; +import org.springframework.stereotype.Service; + +@Service +public class BookingDateServiceImpl extends ServiceImpl implements BookingDateService { + + + /** + * 初始化未来一天的预约日期 + */ + @Override + public BookingDate initBookingDate(String type, int offset) { + String currentDate = DateUtil.formatDate(DateUtil.offsetDay(DateUtil.date(), offset)); + BookingDate bookingDate = new BookingDate(); + bookingDate.setSpecificDate(currentDate); + bookingDate.setTimeSlot("00:00-00:00"); + bookingDate.setIsAvailable(0); + bookingDate.setMaxNumber("0"); + bookingDate.setType(type); + return bookingDate; + } +} diff --git a/src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java b/src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java new file mode 100644 index 0000000..ecdd308 --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java @@ -0,0 +1,76 @@ +package com.cultural.heritage.service.book.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.exception.ThrowUtils; +import com.cultural.heritage.mapper.ClothesGradeMapper; +import com.cultural.heritage.model.entity.ClothesGrade; +import com.cultural.heritage.model.entity.ClothesInfo; +import com.cultural.heritage.service.book.ClothesGradeService; +import com.cultural.heritage.service.book.ClothesInfoService; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ClothesGradeServiceImpl extends ServiceImpl implements ClothesGradeService { + + + @Resource + private ClothesInfoService clothesInfoService; + + + /** + * 校验 + */ + @Override + public void validClothesGrade(ClothesGrade clothesGrade, boolean update) { + Long id = clothesGrade.getId(); + String clothesType = clothesGrade.getClothesType(); + String image = clothesGrade.getImage(); + Double minPrice = clothesGrade.getMinPrice(); + Double maxPrice = clothesGrade.getMaxPrice(); + String brief = clothesGrade.getBrief(); + + if (update) { + if (id == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "参数id错误"); + } + } + if (ObjectUtils.isEmpty(minPrice) || minPrice <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "最低价格参数错误"); + } + if (ObjectUtils.isEmpty(maxPrice) || maxPrice <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "最高价格参数错误"); + } + if (minPrice >= maxPrice) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "最低价格不能高于最高价格"); + } + if (StringUtils.isAnyBlank(clothesType, image, brief)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + } + + + /** + * 删除当前服装等级下的所有服装 + */ + @Override + public void deleteCurrentAllClothes(Long id) { + ClothesGrade clothesGrade = this.getById(id); + String clothesType = clothesGrade.getClothesType(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("clothesType", clothesType); + List list = clothesInfoService.list(queryWrapper); + // 如果当前服装等级下存在服装，就删掉 + if (!ObjectUtils.isEmpty(list)) { + boolean result = clothesInfoService.removeBatchByIds(list); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + } + } +} diff --git a/src/main/java/com/cultural/heritage/service/book/impl/ClothesInfoServiceImpl.java b/src/main/java/com/cultural/heritage/service/book/impl/ClothesInfoServiceImpl.java new file mode 100644 index 0000000..ce4cb34 --- /dev/null +++ b/src/main/java/com/cultural/heritage/service/book/impl/ClothesInfoServiceImpl.java @@ -0,0 +1,70 @@ +package com.cultural.heritage.service.book.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cultural.heritage.common.ErrorCode; +import com.cultural.heritage.constant.CommonConstant; +import com.cultural.heritage.exception.BusinessException; +import com.cultural.heritage.mapper.ClothesInfoMapper; +import com.cultural.heritage.model.dto.clothesinfo.ClothesInfoQueryRequest; +import com.cultural.heritage.model.entity.ClothesInfo; +import com.cultural.heritage.service.book.ClothesInfoService; +import com.cultural.heritage.utils.SqlUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +@Service +public class ClothesInfoServiceImpl extends ServiceImpl implements ClothesInfoService { + + + /** + * 校验 + */ + @Override + public void validClothesInfo(ClothesInfo clothesInfo, boolean update) { + Long id = clothesInfo.getId(); + String name = clothesInfo.getName(); + String image = clothesInfo.getImage(); + String effectImg = clothesInfo.getEffectImg(); + String intro = clothesInfo.getIntro(); + Double price = clothesInfo.getPrice(); + String clothesType = clothesInfo.getClothesType(); + if (update) { + if (id == null) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + } + if (StringUtils.isAnyBlank(name, image, effectImg, intro, clothesType)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "参数不全"); + } + if (ObjectUtils.isEmpty(price) || price < 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "价格参数错误"); + } + } + + + /** + * 获取查询条件 + */ + @Override + public QueryWrapper getQueryWrapper(ClothesInfoQueryRequest clothesInfoQueryRequest) { + Long id = clothesInfoQueryRequest.getId(); + String name = clothesInfoQueryRequest.getName(); + Double minPrice = clothesInfoQueryRequest.getMinPrice(); + Double maxPrice = clothesInfoQueryRequest.getMaxPrice(); + String clothesType = clothesInfoQueryRequest.getClothesType(); + String sortField = clothesInfoQueryRequest.getSortField(); + String sortOrder = clothesInfoQueryRequest.getSortOrder(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(id != null, "id", id); + queryWrapper.like(StringUtils.isNotBlank(name), "name", name); + queryWrapper.eq(StringUtils.isNotBlank(clothesType), "clothesType", clothesType); + queryWrapper.ge(ObjectUtils.isNotEmpty(minPrice), "price", minPrice); + queryWrapper.le(ObjectUtils.isNotEmpty(maxPrice), "price", maxPrice); + queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC), + sortField); + return queryWrapper; + } +} diff --git a/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java b/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java index 8932d79..19ee854 100644 --- a/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java @@ -78,9 +78,7 @@ public class GoodServiceImpl extends ServiceImpl implements Go String detailImg = good.getDetailImg(); String label = good.getLabel(); Integer inventory = good.getInventory(); - Integer isGoodType = good.getIsGoodType(); Integer festivalOrder = good.getFestivalOrder(); - Integer isShelves = good.getIsShelves(); Double price = good.getPrice(); if (update) { @@ -94,15 +92,9 @@ public class GoodServiceImpl extends ServiceImpl implements Go if (ObjectUtils.isEmpty(inventory) || inventory < 1) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "库存量不能小于1"); } - if (ObjectUtils.isEmpty(isGoodType) || isGoodType != 0 && isGoodType != 1) { - throw new BusinessException(ErrorCode.PARAMS_ERROR, "商品类型参数错误"); - } if (ObjectUtils.isEmpty(festivalOrder) || festivalOrder <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "节日参数错误"); } - if (ObjectUtils.isEmpty(isShelves) || isShelves != 0 && isShelves != 1) { - throw new BusinessException(ErrorCode.PARAMS_ERROR, "是否上架参数错误"); - } if (ObjectUtils.isEmpty(price) || price <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "商品价格不能小于等于0"); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3d5fa94..7bcc45c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,9 +1,17 @@ spring: datasource: +# 生产环境 +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai +# username: feiyi +# password: 123456asd + +# 测试环境 driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai + url: jdbc:mysql://123.249.108.160:3306/feiyi?serverTimezone=Asia/Shanghai username: feiyi password: 123456asd + hikari: max-lifetime: 120000 data: diff --git a/src/main/resources/mapper/AdvanceOrderMapper.xml b/src/main/resources/mapper/AdvanceOrderMapper.xml new file mode 100644 index 0000000..b153f14 --- /dev/null +++ b/src/main/resources/mapper/AdvanceOrderMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/BookingDateMapper.xml b/src/main/resources/mapper/BookingDateMapper.xml new file mode 100644 index 0000000..8b8c9df --- /dev/null +++ b/src/main/resources/mapper/BookingDateMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ClothesGradeMapper.xml b/src/main/resources/mapper/ClothesGradeMapper.xml new file mode 100644 index 0000000..3f2f87b --- /dev/null +++ b/src/main/resources/mapper/ClothesGradeMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ClothesInfoMapper.xml b/src/main/resources/mapper/ClothesInfoMapper.xml new file mode 100644 index 0000000..34de016 --- /dev/null +++ b/src/main/resources/mapper/ClothesInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file