diff --git a/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java b/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java index 9d55330..d701c3f 100644 --- a/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java +++ b/src/main/java/com/cultural/heritage/controller/book/ClothesGradeController.java @@ -1,6 +1,7 @@ package com.cultural.heritage.controller.book; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.cultural.heritage.annotation.AuthCheck; import com.cultural.heritage.common.BaseResponse; import com.cultural.heritage.common.ErrorCode; @@ -12,12 +13,15 @@ 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.entity.ClothesInfo; import com.cultural.heritage.model.vo.clothesgrade.ClothesGradeVO; 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.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -37,6 +41,10 @@ public class ClothesGradeController { private ClothesGradeService clothesGradeService; + @Resource + private ClothesInfoService clothesInfoService; + + /** * Web端管理员添加服装等级 * @param clothesGradeAddRequest 服装等级添加请求体 @@ -51,6 +59,7 @@ public class ClothesGradeController { } ClothesGrade clothesGrade = new ClothesGrade(); BeanUtils.copyProperties(clothesGradeAddRequest, clothesGrade); + // 校验 clothesGradeService.validClothesGrade(clothesGrade, false); boolean save = clothesGradeService.save(clothesGrade); ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR); @@ -71,11 +80,30 @@ public class ClothesGradeController { if (clothesGradeUpdateRequest == null || clothesGradeUpdateRequest.getId() <= 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR); } + + // 获取原有服装等级名称 + Long id = clothesGradeUpdateRequest.getId(); + ClothesGrade originClothesGrade = clothesGradeService.getById(id); + String originClothesType = originClothesGrade.getClothesType(); + // 获取目标服装等级名称 + String targetClothesType = clothesGradeUpdateRequest.getClothesType(); + // 判空 + if (StringUtils.isAnyBlank(originClothesType, targetClothesType)) { + throw new BusinessException(ErrorCode.PARAMS_ERROR, "服装等级参数为空"); + } + // 更新原有服装等级下所有服装的等级 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("clothesType", originClothesType).set("clothesType", targetClothesType); + boolean update = clothesInfoService.update(updateWrapper); + ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "服装等级名称更新失败"); + // 更新服装等级信息 ClothesGrade clothesGrade = new ClothesGrade(); BeanUtils.copyProperties(clothesGradeUpdateRequest, clothesGrade); + // 校验 clothesGradeService.validClothesGrade(clothesGrade, true); boolean result = clothesGradeService.updateById(clothesGrade); - ThrowUtils.throwIf(!result, ErrorCode.OPERATION_ERROR); + ThrowUtils.throwIf(!result, 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 820bb01..35279a4 100644 --- a/src/main/java/com/cultural/heritage/controller/good/GoodController.java +++ b/src/main/java/com/cultural/heritage/controller/good/GoodController.java @@ -120,7 +120,7 @@ public class GoodController { good.setType("服务类"); good.setIsGoodType(0); good.setInventory(1); - good.setFestivalOrder(0); + good.setFestivalName("无"); // 校验 goodService.validGood(good, false); boolean save = goodService.save(good); @@ -371,7 +371,7 @@ public class GoodController { long pageSize = serviceGoodQueryRequest.getPageSize(); GoodQueryRequest goodQueryRequest = new GoodQueryRequest(); BeanUtils.copyProperties(serviceGoodQueryRequest, goodQueryRequest); - goodQueryRequest.setFestivalOrder(0); + goodQueryRequest.setFestivalName("无"); goodQueryRequest.setType("服务类"); QueryWrapper goodQueryWrapper = goodService.getGoodQueryWrapper(goodQueryRequest, true); Page page = goodService.page(new Page<>(current, pageSize), goodQueryWrapper); @@ -547,7 +547,7 @@ public class GoodController { good.setType("服务类"); good.setIsGoodType(0); good.setInventory(1); - good.setFestivalOrder(0); + good.setFestivalName("无"); // 校验 goodService.validGood(good, true); boolean result = goodService.updateById(good); @@ -670,7 +670,7 @@ public class GoodController { good.setType("服务类"); good.setIsGoodType(0); good.setInventory(1); - good.setFestivalOrder(0); + good.setFestivalName("无"); // 校验 goodService.validGood(good, true); boolean result = goodService.updateById(good); 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 80b3011..5a0cf89 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 @@ -9,7 +9,7 @@ import java.math.BigDecimal; @Data @Schema(description = "商品添加请求体", requiredProperties = {"name", "type", "price", "goodImg", "intro", - "introDetail", "detailImg", "label", "inventory", "festivalOrder"}) + "introDetail", "detailImg", "label", "inventory", "festivalName"}) public class GoodAddRequest implements Serializable { @@ -68,10 +68,10 @@ public class GoodAddRequest implements Serializable { private Integer inventory; /** - * 节日限定序号 + * 限定节日名称 */ - @Schema(description = "节日序号(1代表端午节，2代表中秋节...)", example = "2") - private Integer festivalOrder; + @Schema(description = "节日名称(端午节，中秋节)", example = "元旦节") + private String festivalName; @TableField(exist = false) diff --git a/src/main/java/com/cultural/heritage/model/dto/good/GoodQueryRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/GoodQueryRequest.java index a0fb26b..9a8223f 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/GoodQueryRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/GoodQueryRequest.java @@ -30,10 +30,10 @@ public class GoodQueryRequest extends PageRequest implements Serializable { private String type; /** - * 节日限定序号 + * 限定节日名称 */ - @Schema(description = "节日序号(1代表端午节，2代表中秋节...)", example = "2") - private Integer festivalOrder; + @Schema(description = "节日名称(端午节，中秋节)", example = "元旦节") + private String festivalName; /** * 是否上架 diff --git a/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java index 6b518cf..c56dc58 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/GoodUpdateRequest.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; @Data @Schema(description = "商品更新请求体", requiredProperties = {"id", "name", "type", "price", "goodImg", "intro", - "introDetail", "detailImg", "label", "inventory", "festivalOrder", "isShelves"}) + "introDetail", "detailImg", "label", "inventory", "festivalName", "isShelves"}) public class GoodUpdateRequest implements Serializable { /** @@ -73,10 +73,10 @@ public class GoodUpdateRequest implements Serializable { private Integer inventory; /** - * 节日限定序号 + * 限定节日名称 */ - @Schema(description = "节日序号(1代表端午节，2代表中秋节...)", example = "2") - private Integer festivalOrder; + @Schema(description = "节日名称(端午节，中秋节)", example = "元旦节") + private String festivalName; /** diff --git a/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java b/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java index 7c3cba9..a5b25b7 100644 --- a/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java +++ b/src/main/java/com/cultural/heritage/model/dto/snapshot/GoodSnapshot.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.math.BigDecimal; @Data -@Schema(description = "订单商品信息", requiredProperties = {"name", "type", "price", "goodImg", "festivalOrder", "reserveDate"}) +@Schema(description = "订单商品信息", requiredProperties = {"name", "type", "price", "goodImg", "festivalName", "reserveDate"}) public class GoodSnapshot implements Serializable { @@ -38,10 +38,10 @@ public class GoodSnapshot implements Serializable { /** - * 节日限定序号 + * 限定节日名称 */ - @Schema(description = "节日序号(1代表端午节，2代表中秋节...)", example = "2") - private Integer festivalOrder; + @Schema(description = "节日名称(端午节，中秋节)", example = "元旦节") + private String festivalName; diff --git a/src/main/java/com/cultural/heritage/model/entity/Good.java b/src/main/java/com/cultural/heritage/model/entity/Good.java index 5e370b5..dc88f71 100644 --- a/src/main/java/com/cultural/heritage/model/entity/Good.java +++ b/src/main/java/com/cultural/heritage/model/entity/Good.java @@ -77,9 +77,9 @@ public class Good implements Serializable { private Integer isGoodType; /** - * 节日限定序号 + * 限定节日名称 */ - private Integer festivalOrder; + private String festivalName; /** 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 index 4700b09..e20df7a 100644 --- a/src/main/java/com/cultural/heritage/model/vo/good/GoodPageVO.java +++ b/src/main/java/com/cultural/heritage/model/vo/good/GoodPageVO.java @@ -65,9 +65,9 @@ public class GoodPageVO implements Serializable { private Integer isGoodType; /** - * 节日限定序号 + * 限定节日名称 */ - private Integer festivalOrder; + private String festivalName; /** 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 index 668ebd2..457acaa 100644 --- a/src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/book/impl/ClothesGradeServiceImpl.java @@ -55,11 +55,15 @@ public class ClothesGradeServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("clothesType", clothesType); if (update) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("id", id).eq("clothesType", clothesType); + queryWrapper.ne("id", id); Long count = this.baseMapper.selectCount(queryWrapper); - ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, ""); + ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "当前服装等级已存在"); + } else { + Long count = this.baseMapper.selectCount(queryWrapper); + ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "不能重复添加服装等级"); } } 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 0afcb76..1de5977 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 @@ -33,7 +33,7 @@ public class GoodServiceImpl extends ServiceImpl implements Go Long id = goodQueryRequest.getId(); String name = goodQueryRequest.getName(); String type = goodQueryRequest.getType(); - Integer festivalOrder = goodQueryRequest.getFestivalOrder(); + String festivalName = goodQueryRequest.getFestivalName(); Integer isShelves = goodQueryRequest.getIsShelves(); String sortField = goodQueryRequest.getSortField(); String sortOrder = goodQueryRequest.getSortOrder(); @@ -45,7 +45,7 @@ public class GoodServiceImpl extends ServiceImpl implements Go if (!isServiceGood){ isGoodType = 1; queryWrapper.like(StringUtils.isNotBlank(type), "type", type); - queryWrapper.eq(ObjectUtils.isNotEmpty(festivalOrder), "festivalOrder", festivalOrder); + queryWrapper.eq(StringUtils.isNotBlank(festivalName), "festivalOrder", festivalName); } queryWrapper.eq(ObjectUtils.isNotEmpty(isShelves), "isShelves", isShelves); queryWrapper.eq(ObjectUtils.isNotEmpty(isGoodType), "isGoodType", isGoodType); @@ -84,7 +84,7 @@ public class GoodServiceImpl extends ServiceImpl implements Go String detailImg = good.getDetailImg(); String label = good.getLabel(); Integer inventory = good.getInventory(); - Integer festivalOrder = good.getFestivalOrder(); + String festivalName = good.getFestivalName(); BigDecimal price = good.getPrice(); if (update) { @@ -92,15 +92,12 @@ public class GoodServiceImpl extends ServiceImpl implements Go throw new BusinessException(ErrorCode.PARAMS_ERROR, "参数id错误"); } } - if (StringUtils.isAnyBlank(type, goodImg, intro, introDetail, detailImg, label, name)) { + if (StringUtils.isAnyBlank(type, goodImg, intro, introDetail, detailImg, label, name, festivalName)) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "存在参数为空"); } if (ObjectUtils.isEmpty(inventory) || inventory < 1) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "库存量不能小于1"); } - if (ObjectUtils.isEmpty(festivalOrder) || festivalOrder < 0) { - throw new BusinessException(ErrorCode.PARAMS_ERROR, "节日参数错误"); - } if (ObjectUtils.isEmpty(price) || price.compareTo(BigDecimal.ZERO) < 0) { throw new BusinessException(ErrorCode.PARAMS_ERROR, "商品价格不能小于等于0"); }