From c9af504c4670be4ee6d438d505779892516afd4c Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Fri, 22 Nov 2024 19:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heritage/config/BookingDateConfig.java | 2 + .../heritage/constant/CouponStatus.java | 13 + .../book/BookingDateController.java | 4 +- .../controller/good/CouponController.java | 291 +++++++++++++----- .../controller/good/GoodController.java | 247 ++++++++++----- .../AppointmentDateAddRequest.java | 12 +- .../AppointmentDateUpdateRequest.java | 10 +- .../coupon/CouponShelvesUpdateRequest.java | 30 ++ .../model/dto/coupon/CouponUpdateRequest.java | 7 + .../dto/exchange/ExchangeAddRequest.java | 6 - .../model/entity/AppointmentDate.java | 17 + .../heritage/model/entity/Coupon.java | 7 + .../heritage/model/entity/Exchange.java | 20 +- .../vo/appointment/AppointmentDateVO.java | 49 +++ .../heritage/model/vo/coupon/CouponVO.java | 59 ++++ .../model/vo/exchange/ExchangeVO.java | 69 +++++ .../heritage/model/vo/good/GoodPageVO.java | 82 +++++ .../heritage/model/vo/good/ServiceGoodVO.java | 7 +- .../heritage/utils/AppointmentDateUtil.java | 23 ++ .../heritage/utils/ReflexObjectUtil.java | 134 +------- .../java/com/cultural/heritage/test/Test.java | 20 +- 21 files changed, 802 insertions(+), 307 deletions(-) create mode 100644 src/main/java/com/cultural/heritage/constant/CouponStatus.java create mode 100644 src/main/java/com/cultural/heritage/model/dto/coupon/CouponShelvesUpdateRequest.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/appointment/AppointmentDateVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/coupon/CouponVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/exchange/ExchangeVO.java create mode 100644 src/main/java/com/cultural/heritage/model/vo/good/GoodPageVO.java create mode 100644 src/main/java/com/cultural/heritage/utils/AppointmentDateUtil.java diff --git a/src/main/java/com/cultural/heritage/config/BookingDateConfig.java b/src/main/java/com/cultural/heritage/config/BookingDateConfig.java index e23bd93..9eb7313 100644 --- a/src/main/java/com/cultural/heritage/config/BookingDateConfig.java +++ b/src/main/java/com/cultural/heritage/config/BookingDateConfig.java @@ -18,6 +18,7 @@ public class BookingDateConfig { @Resource private BookingDateService bookingDateService; + // 写真预约日期初始化 @Bean public Boolean initBookingDate() { System.out.println("这是Config"); @@ -35,4 +36,5 @@ public class BookingDateConfig { } return true; } + } diff --git a/src/main/java/com/cultural/heritage/constant/CouponStatus.java b/src/main/java/com/cultural/heritage/constant/CouponStatus.java new file mode 100644 index 0000000..1c2d56a --- /dev/null +++ b/src/main/java/com/cultural/heritage/constant/CouponStatus.java @@ -0,0 +1,13 @@ +package com.cultural.heritage.constant; + +public interface CouponStatus { + + String IS_NOT_ENABLED = "未启用"; + + + String IS_ENABLED = "可使用"; + + + String IS_OVERDUE = "已过期"; + +} diff --git a/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java b/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java index a027acd..31a7826 100644 --- a/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java +++ b/src/main/java/com/cultural/heritage/controller/book/BookingDateController.java @@ -40,13 +40,13 @@ public class BookingDateController { /** - * 初始化未来一天的预约日期 + * (写真预约)初始化未来一天的预约日期 */ // @Scheduled(cron = "*/5 * * * * ?") // 每天00:00-00:00调用 @Scheduled(cron = "0 0 0 * * ?") @Transactional(rollbackFor = Exception.class) - @GetMapping("/init") + @PostMapping("/init") @Operation(summary = "(自动调用)初始化未来一天的预约日期", description = "参数：无，权限：自动调用，方法名：initCurrentBookingDate") public void initCurrentBookingDate() { // 初始化预约日期 diff --git a/src/main/java/com/cultural/heritage/controller/good/CouponController.java b/src/main/java/com/cultural/heritage/controller/good/CouponController.java index 4ea4b22..063a7bf 100644 --- a/src/main/java/com/cultural/heritage/controller/good/CouponController.java +++ b/src/main/java/com/cultural/heritage/controller/good/CouponController.java @@ -1,26 +1,32 @@ package com.cultural.heritage.controller.good; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +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.CouponStatus; 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.coupon.CouponAddRequest; import com.cultural.heritage.model.dto.coupon.CouponQueryRequest; +import com.cultural.heritage.model.dto.coupon.CouponShelvesUpdateRequest; import com.cultural.heritage.model.dto.coupon.CouponUpdateRequest; import com.cultural.heritage.model.dto.exchange.ExchangeAddRequest; import com.cultural.heritage.model.entity.Coupon; import com.cultural.heritage.model.entity.Exchange; import com.cultural.heritage.model.entity.User; -import com.cultural.heritage.model.entity.UserCoupon; +import com.cultural.heritage.model.vo.coupon.CouponVO; +import com.cultural.heritage.model.vo.exchange.ExchangeVO; import com.cultural.heritage.service.good.CouponService; import com.cultural.heritage.service.good.ExchangeService; -import com.cultural.heritage.service.good.UserCouponService; import com.cultural.heritage.service.user.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,10 +35,10 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; -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 org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.stream.Collectors; @RestController @@ -49,10 +55,6 @@ public class CouponController { private UserService userService; - @Resource - private UserCouponService userCouponService; - - @Resource private ExchangeService exchangeService; @@ -141,71 +143,71 @@ public class CouponController { return ResultUtils.success(page); } - - /** - * 积分兑换优惠券 - * @param exchangeAddRequest 兑换记录添加请求体 - * @return 是否兑换成功 - */ - @PostMapping("/exchange") - @Transactional(rollbackFor = Exception.class) - @Operation(summary = "小程序端用户积分兑换优惠券", description = "参数：兑换记录添加请求体，权限：管理员(admin, boss)，方法名：pointsExchangeCoupon") - public BaseResponse pointsExchangeCoupon(@RequestBody ExchangeAddRequest exchangeAddRequest, HttpServletRequest request) { - if (exchangeAddRequest == null) { - throw new BusinessException(ErrorCode.PARAMS_ERROR); - } - // 更新用户积分 - User loginUser = userService.getLoginUser(request); - Long userId = loginUser.getId(); - Integer requirePoints = exchangeAddRequest.getRequirePoints(); - Integer quantity = exchangeAddRequest.getQuantity(); - if (userId <= 0) { - throw new BusinessException(ErrorCode.PARAMS_ERROR); - } - User user = userService.getById(userId); - ThrowUtils.throwIf(user == null, ErrorCode.NOT_FOUND_ERROR); - int residual = user.getPoints() - requirePoints * quantity; - if (residual < 0) { - throw new BusinessException(ErrorCode.OPERATION_ERROR, "积分不足"); - } - user.setPoints(residual); - boolean save = userService.updateById(user); - ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR); - - // 更新优惠券的库存量 - Long couponId = exchangeAddRequest.getCouponId(); - Coupon coupon = couponService.getById(couponId); - if (coupon.getTotalNum() - quantity < 0) { - throw new BusinessException(ErrorCode.OPERATION_ERROR, "优惠券数量不足"); - } - coupon.setResidueNum(coupon.getTotalNum() - quantity); - boolean updateCoupon = couponService.updateById(coupon); - ThrowUtils.throwIf(!updateCoupon, ErrorCode.OPERATION_ERROR); - - // 校验用户限领量是否已达到上限 - Integer currentNum = couponService.verifyIsReachTheUpperLimit(userId, couponId); - int limitNum = 0; - if (currentNum == null) { - limitNum = quantity; - } else { - limitNum = currentNum + quantity; - } - if ( limitNum > coupon.getLimitNum()) { - throw new BusinessException(ErrorCode.OPERATION_ERROR, "用户限领量已达到上限"); - } - // 插入一条兑换记录 - Exchange exchange = new Exchange(); - BeanUtils.copyProperties(exchangeAddRequest, exchange); - boolean result = exchangeService.save(exchange); - ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); - - // 给当前用户添加优惠券 - UserCoupon userCoupon = new UserCoupon(); - BeanUtils.copyProperties(exchangeAddRequest, userCoupon); - boolean couponResult = userCouponService.save(userCoupon); - ThrowUtils.throwIf(!couponResult, ErrorCode.OPERATION_ERROR); - return ResultUtils.success(true, "兑换成功"); - } +// +// /** +// * 积分兑换优惠券 +// * @param exchangeAddRequest 兑换记录添加请求体 +// * @return 是否兑换成功 +// */ +// @PostMapping("/exchange") +// @Transactional(rollbackFor = Exception.class) +// @Operation(summary = "小程序端用户积分兑换优惠券", description = "参数：兑换记录添加请求体，权限：管理员(admin, boss)，方法名：pointsExchangeCoupon") +// public BaseResponse pointsExchangeCoupon(@RequestBody ExchangeAddRequest exchangeAddRequest, HttpServletRequest request) { +// if (exchangeAddRequest == null) { +// throw new BusinessException(ErrorCode.PARAMS_ERROR); +// } +// // 更新用户积分 +// User loginUser = userService.getLoginUser(request); +// Long userId = loginUser.getId(); +// Integer requirePoints = exchangeAddRequest.getRequirePoints(); +// Integer quantity = exchangeAddRequest.getQuantity(); +// if (userId <= 0) { +// throw new BusinessException(ErrorCode.PARAMS_ERROR); +// } +// User user = userService.getById(userId); +// ThrowUtils.throwIf(user == null, ErrorCode.NOT_FOUND_ERROR); +// int residual = user.getPoints() - requirePoints * quantity; +// if (residual < 0) { +// throw new BusinessException(ErrorCode.OPERATION_ERROR, "积分不足"); +// } +// user.setPoints(residual); +// boolean save = userService.updateById(user); +// ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR); +// +// // 更新优惠券的库存量 +// Long couponId = exchangeAddRequest.getCouponId(); +// Coupon coupon = couponService.getById(couponId); +// if (coupon.getTotalNum() - quantity < 0) { +// throw new BusinessException(ErrorCode.OPERATION_ERROR, "优惠券数量不足"); +// } +// coupon.setResidueNum(coupon.getTotalNum() - quantity); +// boolean updateCoupon = couponService.updateById(coupon); +// ThrowUtils.throwIf(!updateCoupon, ErrorCode.OPERATION_ERROR); +// +// // 校验用户限领量是否已达到上限 +// Integer currentNum = couponService.verifyIsReachTheUpperLimit(userId, couponId); +// int limitNum = 0; +// if (currentNum == null) { +// limitNum = quantity; +// } else { +// limitNum = currentNum + quantity; +// } +// if ( limitNum > coupon.getLimitNum()) { +// throw new BusinessException(ErrorCode.OPERATION_ERROR, "用户限领量已达到上限"); +// } +// // 插入一条兑换记录 +// Exchange exchange = new Exchange(); +// BeanUtils.copyProperties(exchangeAddRequest, exchange); +// boolean result = exchangeService.save(exchange); +// ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); +// +// // 给当前用户添加优惠券 +// UserCoupon userCoupon = new UserCoupon(); +// BeanUtils.copyProperties(exchangeAddRequest, userCoupon); +// boolean couponResult = userCouponService.save(userCoupon); +// ThrowUtils.throwIf(!couponResult, ErrorCode.OPERATION_ERROR); +// return ResultUtils.success(true, "兑换成功"); +// } @@ -228,4 +230,143 @@ public class CouponController { } + /** + * 小程序端用户积分兑换优惠券 + * @param exchangeAddRequest 兑换记录添加请求体 + * @return + */ + @PostMapping("/exchange") + @Operation(summary = "小程序端用户积分兑换优惠券", description = "参数：兑换记录添加请求体，权限：所有人，方法名：pointsExchangeCoupon") + @Transactional(rollbackFor = Exception.class) + public BaseResponse pointsExchangeCoupon(@RequestBody ExchangeAddRequest exchangeAddRequest, HttpServletRequest request) { + // 获取当前用户信息 + User loginUser = userService.getLoginUser(request); + Long userId = loginUser.getId(); + Integer points = loginUser.getPoints(); + + // 获取当前优惠券信息 + Long couponId = exchangeAddRequest.getCouponId(); + Integer quantity = exchangeAddRequest.getQuantity(); + Coupon coupon = couponService.getById(couponId); + ThrowUtils.throwIf(coupon == null, ErrorCode.OPERATION_ERROR, "优惠券不存在"); + Integer limitNum = coupon.getLimitNum(); + Integer residueNum = coupon.getResidueNum(); + + // 判断优惠券库存是否足够 + if (quantity > residueNum) { + throw new BusinessException(ErrorCode.OPERATION_ERROR, "库存不足"); + } + + // 判断用户限领量是否已达标 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("userId", userId).eq("couponId", couponId); + List exchangeList = exchangeService.list(queryWrapper); + int sum = 0; + for (int i = 0; i < exchangeList.size(); i ++ ) { + Exchange exchange = exchangeList.get(i); + sum += exchange.getQuantity(); + } + if (sum + quantity > limitNum) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "当前优惠券的限领量已达标"); + } + + // 判断用户积分是否充足 + Integer requirePoints = coupon.getRequirePoints(); + if (points < quantity * requirePoints) throw new BusinessException(ErrorCode.OPERATION_ERROR, "积分不足"); + + // 更新优惠券库存量 + coupon.setResidueNum(coupon.getResidueNum() - quantity); + boolean result = couponService.updateById(coupon); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "更新优惠券库存失败"); + + // 插入一条兑换记录 + CouponVO couponVO = new CouponVO(); + BeanUtils.copyProperties(coupon, couponVO); + Exchange exchange = new Exchange(); + exchange.setUserId(userId); + exchange.setQuantity(quantity); + exchange.setRestNum(quantity); + exchange.setRequirePoints(requirePoints); + exchange.setCouponId(couponId); + exchange.setCouponDetail(couponVO); + boolean save = exchangeService.save(exchange); + ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR, "兑换记录插入失败"); + + // 更新用户积分 + loginUser.setPoints(loginUser.getPoints() - quantity * requirePoints); + boolean isSuccess = userService.updateById(loginUser); + ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR, "更新用户积分信息失败"); + + return ResultUtils.success(true, "兑换成功"); + } + + + + + + /** + * 小程序端用户查看优惠券 + * @return 兑换记录列表 + */ + @GetMapping("/list/my") + @Operation(summary = "小程序端用户查看优惠券", description = "参数：无，权限：所有人，方法名：pointsExchangeCoupon") + public BaseResponse> listMyCoupon(HttpServletRequest request) { + User loginUser = userService.getLoginUser(request); + Long userId = loginUser.getId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("userId", userId); + List exchangeList = exchangeService.list(queryWrapper); + List exchangeVOS = exchangeList.stream().map(exchange -> { + ExchangeVO exchangeVO = new ExchangeVO(); + BeanUtils.copyProperties(exchange, exchangeVO); + String startTime = exchange.getCouponDetail().getStartTime(); + String endTime = exchange.getCouponDetail().getEndTime(); + DateTime start = DateUtil.parse(startTime); + DateTime end = DateUtil.parse(endTime); + DateTime current = DateUtil.date(); + + boolean isBefore = current.isBefore(start); + boolean isAfter = current.isAfter(end); + boolean isInRange = current.isAfterOrEquals(start) && current.isBeforeOrEquals(end); + + if (isBefore) exchangeVO.setCouponStatus(CouponStatus.IS_NOT_ENABLED); + if (isAfter) exchangeVO.setCouponStatus(CouponStatus.IS_OVERDUE); + if (isInRange) exchangeVO.setCouponStatus(CouponStatus.IS_ENABLED); + return exchangeVO; + }).toList(); + List exchangeVOList = exchangeVOS.stream().filter(exchangeVO -> exchangeVO.getRestNum() != 0) + .collect(Collectors.toList()); + return ResultUtils.success(exchangeVOList); + } + + + + + + /** + * Web端管理员上(下)架优惠券 + * @param couponShelvesUpdateRequest 优惠券上架状态更新请求体 + * @return 是否更新成功 + */ + @PostMapping("/shelves") + @Operation(summary = "Web端管理员上(下)架优惠券", description = "参数：优惠券上架状态更新请求体，权限：管理员(admin, boss)，方法名：deleteExchangeRecord") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + public BaseResponse updateCouponShelvesStatus(@RequestBody CouponShelvesUpdateRequest couponShelvesUpdateRequest) { + if (couponShelvesUpdateRequest == null || couponShelvesUpdateRequest.getId() <= 0) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + Long id = couponShelvesUpdateRequest.getId(); + Integer isShelves = couponShelvesUpdateRequest.getIsShelves(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("isShelves", isShelves); + boolean update = couponService.update(updateWrapper); + ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "上架状态更新失败"); + return ResultUtils.success(true); + } + + + + + } diff --git a/src/main/java/com/cultural/heritage/controller/good/GoodController.java b/src/main/java/com/cultural/heritage/controller/good/GoodController.java index c58570f..e9a3917 100644 --- a/src/main/java/com/cultural/heritage/controller/good/GoodController.java +++ b/src/main/java/com/cultural/heritage/controller/good/GoodController.java @@ -1,6 +1,7 @@ package com.cultural.heritage.controller.good; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cultural.heritage.annotation.AuthCheck; @@ -21,22 +22,30 @@ import com.cultural.heritage.model.dto.good.service.ServiceGoodAddRequest; import com.cultural.heritage.model.dto.good.service.ServiceGoodUpdateRequest; import com.cultural.heritage.model.entity.AppointmentDate; import com.cultural.heritage.model.entity.Good; +import com.cultural.heritage.model.vo.appointment.AppointmentDateVO; +import com.cultural.heritage.model.vo.good.GoodPageVO; import com.cultural.heritage.model.vo.good.ServiceGoodCardVO; import com.cultural.heritage.model.vo.good.ServiceGoodVO; import com.cultural.heritage.service.good.AppointmentDateService; import com.cultural.heritage.service.good.GoodService; import com.cultural.heritage.service.user.UserService; +import com.cultural.heritage.utils.AppointmentDateUtil; 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.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** @@ -62,12 +71,12 @@ public class GoodController { /** - * 添加商品 + * Web端管理员添加常规类商品 * @param goodAddRequest 商品添加请求体 * @return 是否添加成功 */ @PostMapping("/add") - @Operation(summary = "Web端管理员添加商品", description = "参数：商品添加请求体，权限：管理员(admin, boss)，方法名：addGood") + @Operation(summary = "Web端管理员添加常规类商品", description = "参数：商品添加请求体，权限：管理员(admin, boss)，方法名：addGood") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse addGood(@RequestBody GoodAddRequest goodAddRequest) { if (goodAddRequest == null) { @@ -86,12 +95,12 @@ public class GoodController { /** - * 添加服务类商品 + * Web端管理员添加服务类商品 * @param serviceGoodAddRequest 服务类商品添加请求体 * @return 是否添加成功 */ @PostMapping("/add/service") - @Operation(summary = "Web管理员添加服务类商品", description = "参数：服务类商品添加请求体，权限：管理员(admin, boss)，方法名：addServiceGood") + @Operation(summary = "Web端管理员添加服务类商品", description = "参数：服务类商品添加请求体，权限：管理员(admin, boss)，方法名：addServiceGood") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse addServiceGood(@RequestBody ServiceGoodAddRequest serviceGoodAddRequest) { if (serviceGoodAddRequest == null) { @@ -105,12 +114,17 @@ public class GoodController { boolean save = goodService.save(good); ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR); - Long id = good.getId(); + // 获取当天及未来三天的日期 + List dates = AppointmentDateUtil.getDates(); + AtomicInteger idx = new AtomicInteger(0); + // 向预约日期表中批量插入服务类商品的预约信息 + Long id = good.getId(); List appointmentDateAddRequestList = serviceGoodAddRequest.getAppointmentDateAddRequestList(); List appointmentDates = appointmentDateAddRequestList.stream().map(appointmentDateAddRequest -> { AppointmentDate appointmentDate = new AppointmentDate(); BeanUtils.copyProperties(appointmentDateAddRequest, appointmentDate); + appointmentDate.setSpecificDate(dates.get(idx.getAndIncrement())); appointmentDate.setGoodId(id); // 校验 appointmentDateService.validAppointmentDate(appointmentDate, false); @@ -125,12 +139,12 @@ public class GoodController { /** - * 删除商品 + * Web端管理员删除常规类商品 * @param deleteRequest 商品删除请求体 * @return 是否删除成功 */ @PostMapping("/delete") - @Operation(summary = "Web端管理员删除商品", description = "参数：商品删除请求体，权限：管理员(admin, boss)，方法名：deleteGood") + @Operation(summary = "Web端管理员删除常规类商品", description = "参数：商品删除请求体，权限：管理员(admin, boss)，方法名：deleteGood") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse deleteGood(@RequestBody CommonRequest deleteRequest) { if (deleteRequest == null || deleteRequest.getId() <= 0) { @@ -145,39 +159,71 @@ public class GoodController { /** - * 删除服务类商品 + * Web端管理员删除服务类商品 * @param deleteRequest 服务类商品删除请求体 * @return 是否删除成功 */ @PostMapping("/delete/service") @Operation(summary = "Web端管理员删除服务类商品", description = "参数: 商品删除请求体，权限：管理员(admin, boss)，方法名：deleteServiceGood") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Transactional(rollbackFor = Exception.class) public BaseResponse deleteServiceGood(@RequestBody CommonRequest deleteRequest) { if (deleteRequest == null || deleteRequest.getId() <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR); } - // 删除商品表中的服务类商品 Long id = deleteRequest.getId(); - boolean result = goodService.removeById(id); - ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); - // 删除预约日期表中与该商品关联的记录 QueryWrapper dateQueryWrapper = new QueryWrapper<>(); dateQueryWrapper.eq("goodId", id); boolean isSuccess = appointmentDateService.remove(dateQueryWrapper); ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); + // 删除商品表中的服务类商品 + boolean result = goodService.removeById(id); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); return ResultUtils.success(true); } + + + /** - * 更新商品 + * Web端用户批量删除服务类商品 + * @param ids 服务类商品id列表 + * @return 是否删除成功 + */ + @PostMapping("/delBatch/service") + @Operation(summary = "Web端用户批量删除服务类商品", description = "服务类商品id列表，权限：管理员(admin, boss)，方法名：delBatchServiceGoods") + @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse delBatchServiceGoods(@RequestBody List ids) { + if (CollectionUtils.isEmpty(ids)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR); + } + // 删除预约日期表中与该商品关联的记录 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("goodId", ids); + boolean remove = appointmentDateService.remove(queryWrapper); + ThrowUtils.throwIf(!remove, ErrorCode.OPERATION_ERROR, "服务类商品预约日期删除失败"); + + // 删除商品表中的服务类商品 + boolean result = goodService.removeBatchByIds(ids); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "服务类商品删除失败"); + + return ResultUtils.success(true); + + } + + + + /** + * Web端管理员更新常规类商品 * @param goodUpdateRequest 商品更新请求体 * @return 是否更新成功 */ @PostMapping("/update") - @Operation(summary = "Web端管理员更新商品", description = "参数：商品更新请求体，权限：管理员(admin, boss)，方法名：updateGoods") + @Operation(summary = "Web端管理员更新常规类商品", description = "参数：商品更新请求体，权限：管理员(admin, boss)，方法名：updateGoods") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse updateGoods(@RequestBody GoodUpdateRequest goodUpdateRequest) { if (goodUpdateRequest == null || goodUpdateRequest.getId() <= 0) { @@ -196,19 +242,31 @@ public class GoodController { /** - * 分页获取商品列表 + * Web端管理员分页查询常规类商品 * @param goodQueryRequest 查询商品请求体 * @return 商品信息列表 */ @PostMapping("/list/page") - @Operation(summary = "Web端管理员分页查询商品", description = "参数：商品查询请求体，排序字段 sortField: price inventory id，权限：管理员(admin, boss)，方法名：listGoodByPage") + @Operation(summary = "Web端管理员分页查询常规类商品", description = "参数：商品查询请求体，排序字段 sortField: price inventory id，权限：管理员(admin, boss)，方法名：listGoodByPage") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) - public BaseResponse> listGoodByPage(@RequestBody GoodQueryRequest goodQueryRequest) { + public BaseResponse> listGoodByPage(@RequestBody GoodQueryRequest goodQueryRequest) { long current = goodQueryRequest.getCurrent(); long pageSize = goodQueryRequest.getPageSize(); QueryWrapper goodQueryWrapper = goodService.getGoodQueryWrapper(goodQueryRequest); Page page = goodService.page(new Page<>(current, pageSize), goodQueryWrapper); - return ResultUtils.success(page); + List records = page.getRecords(); + List goodPageVOS = records.stream().map(good -> { + GoodPageVO goodPageVO = new GoodPageVO(); + BeanUtils.copyProperties(good, goodPageVO); + return goodPageVO; + }).toList(); + Page goodPageVOPage = new Page<>(); + goodPageVOPage.setRecords(goodPageVOS); + goodPageVOPage.setTotal(page.getTotal()); + goodPageVOPage.setSize(page.getSize()); + goodPageVOPage.setCurrent(page.getCurrent()); + goodPageVOPage.setPages(page.getPages()); + return ResultUtils.success(goodPageVOPage); } @@ -216,12 +274,12 @@ public class GoodController { /** - * 批量删除商品 + * Web端管理员批量删除常规类商品 * @param commonDelBatchRequest 批量删除请求体 * @return 是否批量删除成功 */ @PostMapping("/delBatch") - @Operation(summary = "Web端管理员批量删除商品", description = "参数：商品批量删除请求体，权限：管理员(admin, boss)，方法名：delBatchGoods") + @Operation(summary = "Web端管理员批量删除常规类商品", description = "参数：商品批量删除请求体，权限：管理员(admin, boss)，方法名：delBatchGoods") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse delBatchGoods(@RequestBody CommonDelBatchRequest commonDelBatchRequest) { List idList = commonDelBatchRequest.getIdList(); @@ -235,27 +293,28 @@ public class GoodController { /** - * 根据id查询商品 + * 小程序端用户根据id查询常规类商品 * @param getByIdRequest 根据id查询请求体 * @return 商品信息 */ @PostMapping("/getById") - @Operation(summary = "根据id查询商品", description = "参数：商品根据id查询请求体，权限：所有人, 方法名:getGoodById") - public BaseResponse getGoodById(@RequestBody CommonRequest getByIdRequest, HttpServletRequest request) { + @Operation(summary = "小程序端用户根据id查询常规类商品", description = "参数：商品根据id查询请求体，权限：所有人, 方法名:getGoodById") + public BaseResponse getGoodById(@RequestBody CommonRequest getByIdRequest) { if (getByIdRequest == null || getByIdRequest.getId() <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR); } - userService.getLoginUser(request); Long id = getByIdRequest.getId(); Good good = goodService.getById(id); ThrowUtils.throwIf(good == null, ErrorCode.NOT_FOUND_ERROR); - return ResultUtils.success(good); + GoodPageVO goodPageVO = new GoodPageVO(); + BeanUtils.copyProperties(good, goodPageVO); + return ResultUtils.success(goodPageVO); } /** - * 分页获取服务类商品列表 + * Web端管理员分页查询服务类商品 * @param goodQueryRequest 商品查询请求体 * @return 服务类商品列表 */ @@ -271,14 +330,34 @@ public class GoodController { QueryWrapper goodQueryWrapper = goodService.getGoodQueryWrapper(goodQueryRequest); Page page = goodService.page(new Page<>(current, pageSize), goodQueryWrapper); List records = page.getRecords(); + + + // 获取当天及未来三天的日期 + List dates = AppointmentDateUtil.getDates(); + + // 用map集合存储服务类商品关联的预约日期 + List appointmentDateList = appointmentDateService.list(); + List appointmentDateVOS = appointmentDateList.stream().map(appointmentDate -> { + AppointmentDateVO appointmentDateVO = new AppointmentDateVO(); + BeanUtils.copyProperties(appointmentDate, appointmentDateVO); + return appointmentDateVO; + }).toList(); + Map> map = new HashMap<>(); + for (AppointmentDateVO appointmentDateVO : appointmentDateVOS) { + Long goodId = appointmentDateVO.getGoodId(); + String specificDate = appointmentDateVO.getSpecificDate(); + if (!dates.contains(specificDate)) continue; + List dateVOList = map.get(goodId) != null ? map.get(goodId) : new ArrayList<>(); + dateVOList.add(appointmentDateVO); + map.put(goodId, dateVOList); + } + List serviceGoodVOList = records.stream().map(good -> { ServiceGoodVO serviceGoodVO = new ServiceGoodVO(); BeanUtils.copyProperties(good, serviceGoodVO); Long id = good.getId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("goodId", id); - List list = appointmentDateService.list(queryWrapper); - serviceGoodVO.setAppointmentDateList(list); + List appointmentDateVOList = map.get(id); + serviceGoodVO.setAppointmentDateVOS(appointmentDateVOList); return serviceGoodVO; }).toList(); Page serviceGoodVOPage = new Page<>(); @@ -293,7 +372,7 @@ public class GoodController { /** - * 根据id查询服务类商品信息 + * 小程序端用户根据id查询服务类商品 * @param commonRequest 根据id查询请求体 * @return 服务类商品信息 */ @@ -307,23 +386,31 @@ public class GoodController { Long id = commonRequest.getId(); Good good = goodService.getById(id); ThrowUtils.throwIf(good == null, ErrorCode.NOT_FOUND_ERROR, "商品不存在"); - Integer isGoodType = good.getIsGoodType(); - if (isGoodType == 1) { - throw new BusinessException(ErrorCode.SYSTEM_ERROR, "请求结果不是服务类商品"); - } ServiceGoodVO serviceGoodVO = new ServiceGoodVO(); BeanUtils.copyProperties(good, serviceGoodVO); + + // 获取当天及未来三天的日期 + List dates = AppointmentDateUtil.getDates(); + + // 获取当前服务类商品关联的预约日期 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("goodId", id); List appointmentDateList = appointmentDateService.list(queryWrapper); - serviceGoodVO.setAppointmentDateList(appointmentDateList); + List appointmentDateVOS = appointmentDateList.stream().map(appointmentDate -> { + AppointmentDateVO appointmentDateVO = new AppointmentDateVO(); + BeanUtils.copyProperties(appointmentDate, appointmentDateVO); + return appointmentDateVO; + }).toList(); + List dateVOList = appointmentDateVOS.stream() + .filter(appointmentDateVO -> dates.contains(appointmentDateVO.getSpecificDate())).toList(); + serviceGoodVO.setAppointmentDateVOS(dateVOList); return ResultUtils.success(serviceGoodVO); } /** - * 展示服务类商品卡片 + * 小程序端展示服务类商品卡片 * @return 服务类商品卡片列表 */ @GetMapping("/service/list/card") @@ -342,8 +429,11 @@ public class GoodController { } + + + /** - * 更新服务类商品 + * Web端管理员更新服务类商品 * @param serviceGoodUpdateRequest 服务类商品更新请求体 * @return 是否更新成功 */ @@ -354,54 +444,32 @@ public class GoodController { if (serviceGoodUpdateRequest == null || serviceGoodUpdateRequest.getId() <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR); } - // 更新商品的基本信息 - ServiceGoodVO serviceGoodVO = new ServiceGoodVO(); - BeanUtils.copyProperties(serviceGoodUpdateRequest, serviceGoodVO); + // 更新服务类商品的基本信息 + Good good = new Good(); + BeanUtils.copyProperties(serviceGoodUpdateRequest, good); + good.setIsGoodType(0); // 校验 - goodService.validGood(serviceGoodVO, true); - boolean result = goodService.updateById(serviceGoodVO); - ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + goodService.validGood(good, true); + boolean result = goodService.updateById(good); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "商品不存在"); - // 获取当前商品原有的预约日期列表 - Long id = serviceGoodUpdateRequest.getId(); - QueryWrapper dateQueryWrapper = new QueryWrapper<>(); - dateQueryWrapper.eq("goodId", id); - List appointmentDates = appointmentDateService.list(dateQueryWrapper); - List dateIds = appointmentDates.stream().map(appointmentDate -> { - Long dateId = appointmentDate.getId(); - return dateId; - }).toList(); + // 获取当天及未来三天的日期 + List dates = AppointmentDateUtil.getDates(); + AtomicInteger idx = new AtomicInteger(0); - // 获取需要更新的预约日期列表 + // 封装预约日期实体类 List appointmentDateUpdateRequestList = serviceGoodUpdateRequest.getAppointmentDateUpdateRequestList(); - List updateDateIds = appointmentDateUpdateRequestList.stream().map(appointmentDateUpdateRequest -> { - Long dateId = appointmentDateUpdateRequest.getId(); - return dateId; - }).toList(); - - // 获取需要删除的预约日期id - List deleteIds = new ArrayList<>(); - dateIds.forEach(dateId -> { - if (!updateDateIds.contains(dateId)) { - deleteIds.add(dateId); - } - }); - - // 如果存在需要删除的预约日期id, 就删除 - if (!CollectionUtils.isEmpty(deleteIds)) { - boolean isSuccessDelete = appointmentDateService.removeBatchByIds(deleteIds); - ThrowUtils.throwIf(!isSuccessDelete, ErrorCode.OPERATION_ERROR); - } - - // 更新当前商品的预约日期 List appointmentDateList = appointmentDateUpdateRequestList.stream().map(appointmentDateUpdateRequest -> { AppointmentDate appointmentDate = new AppointmentDate(); BeanUtils.copyProperties(appointmentDateUpdateRequest, appointmentDate); - appointmentDate.setGoodId(id); + appointmentDate.setSpecificDate(dates.get(idx.getAndIncrement())); + appointmentDate.setGoodId(good.getId()); // 校验 appointmentDateService.validAppointmentDate(appointmentDate, true); return appointmentDate; }).toList(); + + // 更新当前服务类商品的预约日期 boolean isSuccess = appointmentDateService.updateBatchById(appointmentDateList); ThrowUtils.throwIf(!isSuccess, ErrorCode.OPERATION_ERROR); return ResultUtils.success(true); @@ -410,6 +478,35 @@ public class GoodController { + /** + * (服务类商品)初始化未来一天的预约日期 + */ +// @Scheduled(cron = "*/5 * * * * ?") + // 每天00:00-00:00调用 + @Scheduled(cron = "0 0 0 * * ?") + @PostMapping("/service/init") + @Operation(summary = "(服务类商品)初始化未来一天的预约日期", description = "参数：无，权限：自动调用，方法名：initServiceGoodBookingDate") + @Transactional(rollbackFor = Exception.class) + public void initServiceGoodBookingDate() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("isGoodType", 0); + List goodList = goodService.list(queryWrapper); + List appointmentDateList = new ArrayList<>(); + goodList.forEach(good -> { + AppointmentDate appointmentDate = new AppointmentDate(); + appointmentDate.setGoodId(good.getId()); + appointmentDate.setSpecificDate(DateUtil.formatDate(DateUtil.offsetDay(DateUtil.date(), 3))); + appointmentDate.setTimeSlot("00:00-00:00"); + appointmentDate.setIsAvailable(0); + appointmentDate.setNumberRange("(0,0)"); + appointmentDateList.add(appointmentDate); + }); + boolean result = appointmentDateService.saveBatch(appointmentDateList); + ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR, "初始化失败"); + } + + + } diff --git a/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateAddRequest.java index d7a9d56..d7351a3 100644 --- a/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateAddRequest.java @@ -7,15 +7,15 @@ import java.io.Serial; import java.io.Serializable; @Data -@Schema(description = "预约日期请求体", requiredProperties = {"specificDate", "timeSlot", "isAvailable", "minNumber", "maxNumber"}) +@Schema(description = "预约日期请求体", requiredProperties = {"timeSlot", "isAvailable", "minNumber", "maxNumber"}) public class AppointmentDateAddRequest implements Serializable { - /** - * 预约具体日期 - */ - @Schema(description = "预约具体日期", example = "2024-11-09") - private String specificDate; +// /** +// * 预约具体日期 +// */ +// @Schema(description = "预约具体日期", example = "2024-11-09") +// private String specificDate; /** diff --git a/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateUpdateRequest.java index 0f135fb..bb98435 100644 --- a/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/appointment/AppointmentDateUpdateRequest.java @@ -16,11 +16,11 @@ public class AppointmentDateUpdateRequest implements Serializable { private Long id; - /** - * 预约具体日期 - */ - @Schema(description = "预约具体日期", example = "2024-11-09") - private String specificDate; +// /** +// * 预约具体日期 +// */ +// @Schema(description = "预约具体日期", example = "2024-11-09") +// private String specificDate; /** diff --git a/src/main/java/com/cultural/heritage/model/dto/coupon/CouponShelvesUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/coupon/CouponShelvesUpdateRequest.java new file mode 100644 index 0000000..e2e6c56 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/dto/coupon/CouponShelvesUpdateRequest.java @@ -0,0 +1,30 @@ +package com.cultural.heritage.model.dto.coupon; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "优惠券上架状态更新请求体", requiredProperties = {"id", "isShelves"}) +public class CouponShelvesUpdateRequest implements Serializable { + + + /** + * 订单id + */ + @Schema(description = "优惠券id(id > 0)", example = "8") + private Long id; + + + /** + * 优惠券上架状态 + */ + @Schema(description = "优惠券上架状态", example = "1") + private Integer isShelves; + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/dto/coupon/CouponUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/coupon/CouponUpdateRequest.java index 44e39ca..aa7e66a 100644 --- a/src/main/java/com/cultural/heritage/model/dto/coupon/CouponUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/coupon/CouponUpdateRequest.java @@ -92,6 +92,13 @@ public class CouponUpdateRequest implements Serializable { private String description; + /** + * 是否上架 + */ + @Schema(description = "是否上架", example = "1") + private Integer isShelves; + + @Serial private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cultural/heritage/model/dto/exchange/ExchangeAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/exchange/ExchangeAddRequest.java index fe50604..2f6d45b 100644 --- a/src/main/java/com/cultural/heritage/model/dto/exchange/ExchangeAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/exchange/ExchangeAddRequest.java @@ -27,12 +27,6 @@ public class ExchangeAddRequest implements Serializable { @Schema(description = "购买数量", example = "10") private Integer quantity; - /** - * 优惠券积分价格 - */ - @Schema(description = "优惠券积分价格", example = "2000") - private Integer requirePoints; - @Serial private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cultural/heritage/model/entity/AppointmentDate.java b/src/main/java/com/cultural/heritage/model/entity/AppointmentDate.java index af44897..218caeb 100644 --- a/src/main/java/com/cultural/heritage/model/entity/AppointmentDate.java +++ b/src/main/java/com/cultural/heritage/model/entity/AppointmentDate.java @@ -7,6 +7,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Date; /** * 预约日期表 @@ -54,6 +55,22 @@ public class AppointmentDate implements Serializable { private Long goodId; + /** + * 创建时间 + */ + 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/Coupon.java b/src/main/java/com/cultural/heritage/model/entity/Coupon.java index 40e259b..9968101 100644 --- a/src/main/java/com/cultural/heritage/model/entity/Coupon.java +++ b/src/main/java/com/cultural/heritage/model/entity/Coupon.java @@ -92,6 +92,13 @@ public class Coupon implements Serializable { */ private String description; + + /** + * 是否上架 + */ + private Integer isShelves; + + /** * 创建时间 */ diff --git a/src/main/java/com/cultural/heritage/model/entity/Exchange.java b/src/main/java/com/cultural/heritage/model/entity/Exchange.java index 6eae96e..f67ea89 100644 --- a/src/main/java/com/cultural/heritage/model/entity/Exchange.java +++ b/src/main/java/com/cultural/heritage/model/entity/Exchange.java @@ -1,8 +1,11 @@ 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.vo.coupon.CouponVO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,7 +18,7 @@ import java.util.Date; * @TableName exchange_record */ @Data -@TableName("exchange_record") +@TableName(value = "exchange_record", autoResultMap = true) public class Exchange implements Serializable { @@ -30,16 +33,31 @@ public class Exchange implements Serializable { */ private Long userId; + /** * 优惠券id */ private Long couponId; + + /** + * 优惠券信息 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private CouponVO couponDetail; + /** * 数量 */ private Integer quantity; + + /** + * 剩余数量 + */ + private Integer restNum; + + /** * 优惠券积分价格 */ diff --git a/src/main/java/com/cultural/heritage/model/vo/appointment/AppointmentDateVO.java b/src/main/java/com/cultural/heritage/model/vo/appointment/AppointmentDateVO.java new file mode 100644 index 0000000..bc7b4a2 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/appointment/AppointmentDateVO.java @@ -0,0 +1,49 @@ +package com.cultural.heritage.model.vo.appointment; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class AppointmentDateVO implements Serializable { + + + /** + * 预约日期id + */ + private Long id; + + + /** + * 预约具体日期 + */ + private String specificDate; + + + /** + * 预约时间段 + */ + private String timeSlot; + + + /** + * 是否可预约 + */ + private Integer isAvailable; + + + /** + * 预约人数范围 + */ + private String numberRange; + + + /** + * 商品id + */ + private Long goodId; + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/coupon/CouponVO.java b/src/main/java/com/cultural/heritage/model/vo/coupon/CouponVO.java new file mode 100644 index 0000000..37362f6 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/coupon/CouponVO.java @@ -0,0 +1,59 @@ +package com.cultural.heritage.model.vo.coupon; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class CouponVO implements Serializable { + + + /** + * 优惠券名称 + */ + private String name; + + /** + * 满减金额 + */ + private BigDecimal conditionAmount; + + + /** + * 优惠券简介 + */ + private String intro; + + /** + * 优惠券图片 + */ + private String image; + + /** + * 有效开始日期 + */ + private String startTime; + + + /** + * 有效截止日期 + */ + private String endTime; + + /** + * 作用范围 + */ + private String useScope; + + /** + * 使用说明 + */ + private String description; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/exchange/ExchangeVO.java b/src/main/java/com/cultural/heritage/model/vo/exchange/ExchangeVO.java new file mode 100644 index 0000000..1aa29c7 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/exchange/ExchangeVO.java @@ -0,0 +1,69 @@ +package com.cultural.heritage.model.vo.exchange; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.cultural.heritage.model.vo.coupon.CouponVO; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +@Data +public class ExchangeVO implements Serializable { + + + /** + * 兑换记录id + */ + private Long id; + + + /** + * 优惠券id + */ + private Long couponId; + + + /** + * 优惠券信息 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private CouponVO couponDetail; + + /** + * 数量 + */ + private Integer quantity; + + + /** + * 剩余数量 + */ + private Integer restNum; + + + /** + * 优惠券积分价格 + */ + private Integer requirePoints; + + + /** + * 优惠券状态(未开始，可使用，已过期) + */ + private String couponStatus; + + + /** + * 创建时间 + */ + @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/good/GoodPageVO.java b/src/main/java/com/cultural/heritage/model/vo/good/GoodPageVO.java new file mode 100644 index 0000000..4700b09 --- /dev/null +++ b/src/main/java/com/cultural/heritage/model/vo/good/GoodPageVO.java @@ -0,0 +1,82 @@ +package com.cultural.heritage.model.vo.good; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class GoodPageVO implements Serializable { + + /** + * 商品编号 + */ + private Long id; + + /** + * 商品名 + */ + private String name; + + /** + * 商品类型 + */ + private String type; + + /** + * 商品价格 + */ + private BigDecimal price; + + /** + * 商品图片 + */ + private String goodImg; + + /** + * 商品简介 + */ + private String intro; + + /** + * 商品详情简介 + */ + private String introDetail; + + /** + * 商品详情图片 + */ + private String detailImg; + + /** + * 商品标签 + */ + private String label; + + /** + * 商品库存量 + */ + private Integer inventory; + + /** + * 是否是商品类型 + */ + private Integer isGoodType; + + /** + * 节日限定序号 + */ + private Integer festivalOrder; + + + /** + * 是否上架 + */ + private Integer isShelves; + + + + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cultural/heritage/model/vo/good/ServiceGoodVO.java b/src/main/java/com/cultural/heritage/model/vo/good/ServiceGoodVO.java index 4461e16..3a5d88e 100644 --- a/src/main/java/com/cultural/heritage/model/vo/good/ServiceGoodVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/good/ServiceGoodVO.java @@ -1,7 +1,6 @@ package com.cultural.heritage.model.vo.good; -import com.cultural.heritage.model.entity.AppointmentDate; -import com.cultural.heritage.model.entity.Good; +import com.cultural.heritage.model.vo.appointment.AppointmentDateVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,14 +9,14 @@ import java.io.Serializable; import java.util.List; @Data -public class ServiceGoodVO extends Good implements Serializable { +public class ServiceGoodVO extends GoodPageVO implements Serializable { /** * 未来几天的预约详情 */ @Schema(description = "未来几天的预约详情") - private List appointmentDateList; + private List appointmentDateVOS; @Serial diff --git a/src/main/java/com/cultural/heritage/utils/AppointmentDateUtil.java b/src/main/java/com/cultural/heritage/utils/AppointmentDateUtil.java new file mode 100644 index 0000000..3e2299b --- /dev/null +++ b/src/main/java/com/cultural/heritage/utils/AppointmentDateUtil.java @@ -0,0 +1,23 @@ +package com.cultural.heritage.utils; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; + +import java.util.ArrayList; +import java.util.List; + +public class AppointmentDateUtil { + + // 将当天及未来三天的日期加入到集合中 + public static List getDates() { + List dates = new ArrayList<>(); + for (int i = 0; i < 4; i ++ ) { + DateTime date = DateUtil.date(); + DateTime dateTime = DateUtil.offsetDay(date, i); + String formatDate = DateUtil.formatDate(dateTime); + dates.add(formatDate); + } + return dates; + } + +} diff --git a/src/main/java/com/cultural/heritage/utils/ReflexObjectUtil.java b/src/main/java/com/cultural/heritage/utils/ReflexObjectUtil.java index 096a231..0e50124 100644 --- a/src/main/java/com/cultural/heritage/utils/ReflexObjectUtil.java +++ b/src/main/java/com/cultural/heritage/utils/ReflexObjectUtil.java @@ -1,162 +1,38 @@ package com.cultural.heritage.utils; import java.lang.reflect.Field; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** * 反射处理Bean，得到里面的属性值 * - * @author liulinsen - * */ public class ReflexObjectUtil { /** * 单个对象的所有键值 - * - * 单个对象 - * - * @return Map map 所有 String键 Object值 ex：{pjzyfy=0.00, - * xh=01, zzyl=0.00, mc=住院患者压疮发生率, pjypfy=0.00, rs=0, pjzyts=0.00, - * czydm=0037, lx=921, zssl=0.00} */ public static Map getKeyAndValue(Object obj) { - Map map = new HashMap(); + Map map = new HashMap<>(); // 得到类对象 - Class userCla = (Class) obj.getClass(); + Class userCla = obj.getClass(); /* 得到类中的所有属性集合 */ Field[] fs = userCla.getDeclaredFields(); for (int i = 0; i < fs.length; i++) { Field f = fs[i]; f.setAccessible(true); // 设置些属性是可以访问的 - Object val = new Object(); + Object val; try { val = f.get(obj); // 得到此属性的值 map.put(f.getName(), val);// 设置键值 - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } - - /* - * String type = f.getType().toString();//得到此属性的类型 if - * (type.endsWith("String")) { - * System.out.println(f.getType()+"\t是String"); f.set(obj,"12") ; - * //给属性设值 }else if(type.endsWith("int") || - * type.endsWith("Integer")){ - * System.out.println(f.getType()+"\t是int"); f.set(obj,12) ; //给属性设值 - * }else{ System.out.println(f.getType()+"\t"); } - */ - } - System.out.println("单个对象的所有键值==反射==" + map.toString()); + System.out.println("单个对象的所有键值==反射==" + map); return map; } - /** - * 单个对象的某个键的值 - * - * 对象 - * - * @param key - * 键 - * - * @return Object 键在对象中所对应得值 没有查到时返回空字符串 - */ - public static Object getValueByKey(Object obj, String key) { - // 得到类对象 - Class userCla = (Class) obj.getClass(); - /* 得到类中的所有属性集合 */ - Field[] fs = userCla.getDeclaredFields(); - for (int i = 0; i < fs.length; i++) { - Field f = fs[i]; - f.setAccessible(true); // 设置些属性是可以访问的 - try { - - if (f.getName().endsWith(key)) { - System.out.println("单个对象的某个键的值==反射==" + f.get(obj)); - return f.get(obj); - } - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - // 没有查到时返回空字符串 - return ""; - } - - /** - * - * @param object - * @return - */ - - public static List> getKeysAndValues(List object) { - List> list = new ArrayList>(); - for (Object obj : object) { - Class userCla; - // 得到类对象 - userCla = (Class) obj.getClass(); - /* 得到类中的所有属性集合 */ - Field[] fs = userCla.getDeclaredFields(); - Map listChild = new HashMap(); - for (int i = 0; i < fs.length; i++) { - Field f = fs[i]; - f.setAccessible(true); // 设置些属性是可以访问的 - Object val = new Object(); - try { - val = f.get(obj); - // 得到此属性的值 - listChild.put(f.getName(), val);// 设置键值 - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - list.add(listChild);// 将map加入到list集合中 - } - System.out.println("多个（列表）对象的所有键值====" + list.toString()); - return list; - } - - /** - * 多个（列表）对象的某个键的值 - * - * @param object - * @param key - * @return List 键在列表中对应的所有值 ex:key为上面方法中的mc字段 那么返回的数据就是： [住院患者压疮发生率, - * 新生儿产伤发生率, 阴道分娩产妇产伤发生率, 输血反应发生率, 剖宫产率] - */ - public static List getValuesByKey(List object, String key) { - List list = new ArrayList(); - for (Object obj : object) { - // 得到类对象 - Class userCla = (Class) obj.getClass(); - /* 得到类中的所有属性集合 */ - Field[] fs = userCla.getDeclaredFields(); - for (int i = 0; i < fs.length; i++) { - Field f = fs[i]; - f.setAccessible(true); // 设置些属性是可以访问的 - try { - if (f.getName().endsWith(key)) { - list.add(f.get(obj)); - } - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - System.out.println("多个（列表）对象的某个键的值列表====" + list.toString()); - return list; - } } \ No newline at end of file diff --git a/src/test/java/com/cultural/heritage/test/Test.java b/src/test/java/com/cultural/heritage/test/Test.java index 83b876b..ec6b918 100644 --- a/src/test/java/com/cultural/heritage/test/Test.java +++ b/src/test/java/com/cultural/heritage/test/Test.java @@ -1,6 +1,7 @@ package com.cultural.heritage.test; -import java.math.BigDecimal; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; public class Test { public static void main(String[] args) { @@ -24,8 +25,19 @@ public class Test { // System.out.println(StringUtils.isAnyBlank("333", "333", null, "dfs")); // System.out.println(StringUtils.isAnyBlank(null)); // System.out.println(ObjectUtils.anyNull(null)); - Integer quantity = 10; - BigDecimal bigDecimal = BigDecimal.valueOf(quantity); - System.out.println(bigDecimal); + +// Integer quantity = 10; +// BigDecimal bigDecimal = BigDecimal.valueOf(quantity); +// System.out.println(bigDecimal); + DateTime date = DateUtil.date(); + System.out.println(date); + String formatDate = DateUtil.formatDate(date); + System.out.println(formatDate); + +// String str = "2024-11-21 22:43:33"; +// DateTime parse = DateUtil.parse(str); +// System.out.println(parse); + + } }