From 6dca8e082b42495f38bd0569278b8368e6a03e6c Mon Sep 17 00:00:00 2001 From: franky <16621167566@163.com> Date: Sun, 5 Jun 2022 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/sku/ProductSkuController.java | 12 +++---- .../admin/sku/vo/ProductSkuBaseVO.java | 4 +-- .../admin/sku/vo/ProductSkuUpdateReqVO.java | 2 +- .../admin/spu/ProductSpuController.java | 15 ++++----- .../admin/spu/vo/ProductSpuCreateReqVO.java | 7 +++++ .../admin/spu/vo/SpuUpdateReqVO.java | 9 +++++- .../convert/sku/ProductSkuConvert.java | 24 ++++++++++++++ .../convert/spu/ProductSpuConvert.java | 18 +++++++++++ .../dal/dataobject/sku/ProductSkuDO.java | 10 ++---- .../dal/dataobject/spu/ProductSpuDO.java | 5 +-- .../service/category/CategoryService.java | 6 ++++ .../service/category/CategoryServiceImpl.java | 8 +++++ .../service/sku/ProductSkuService.java | 13 +++++--- .../service/sku/ProductSkuServiceImpl.java | 19 +++++++++--- .../service/spu/ProductSpuService.java | 8 ++--- .../service/spu/ProductSpuServiceImpl.java | 31 ++++++++++++++++--- .../service/sku/SkuServiceImplTest.java | 6 ++-- .../spu/ProductSpuServiceImplTest.java | 6 ++-- .../src/views/mall/product/spu/index.vue | 2 +- 19 files changed, 153 insertions(+), 52 deletions(-) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java index 878318f78..864f3cbce 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java @@ -38,7 +38,7 @@ public class ProductSkuController { @PostMapping("/create") @ApiOperation("创建商品sku") @PreAuthorize("@ss.hasPermission('product:sku:create')") - public CommonResult createSku(@Valid @RequestBody ProductSkuCreateReqVO createReqVO) { + public CommonResult createSku(@Valid @RequestBody ProductSkuCreateReqVO createReqVO) { return success(ProductSkuService.createSku(createReqVO)); } @@ -52,18 +52,18 @@ public class ProductSkuController { @DeleteMapping("/delete") @ApiOperation("删除商品sku") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Integer.class) + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('product:sku:delete')") - public CommonResult deleteSku(@RequestParam("id") Integer id) { + public CommonResult deleteSku(@RequestParam("id") Long id) { ProductSkuService.deleteSku(id); return success(true); } @GetMapping("/get") @ApiOperation("获得商品sku") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Integer.class) + @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('product:sku:query')") - public CommonResult getSku(@RequestParam("id") Integer id) { + public CommonResult getSku(@RequestParam("id") Long id) { ProductSkuDO sku = ProductSkuService.getSku(id); return success(ProductSkuConvert.INSTANCE.convert(sku)); } @@ -72,7 +72,7 @@ public class ProductSkuController { @ApiOperation("获得商品sku列表") @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) @PreAuthorize("@ss.hasPermission('product:sku:query')") - public CommonResult> getSkuList(@RequestParam("ids") Collection ids) { + public CommonResult> getSkuList(@RequestParam("ids") Collection ids) { List list = ProductSkuService.getSkuList(ids); return success(ProductSkuConvert.INSTANCE.convertList(list)); } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java index 9f351e9b7..c3c84d3cc 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java @@ -16,8 +16,8 @@ public class ProductSkuBaseVO { @NotNull(message = "spu编号不能为空") private Long spuId; - @ApiModelProperty(value = "规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]", required = true) - @NotNull(message = "规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }]不能为空") + @ApiModelProperty(value = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]", required = true) + @NotNull(message = "规格值数组-json格式， [{propertyId: , valueId: }, {propertyId: , valueId: }]不能为空") private List properties; @ApiModelProperty(value = "销售价格，单位：分", required = true) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java index ec79a09e9..984976eee 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuUpdateReqVO.java @@ -13,6 +13,6 @@ public class ProductSkuUpdateReqVO extends ProductSkuBaseVO { @ApiModelProperty(value = "主键", required = true) @NotNull(message = "主键不能为空") - private Integer id; + private Long id; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java index 742ffd83e..ee61ce4e6 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.product.controller.admin.spu; +import nonapi.io.github.classgraph.utils.LogNode; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,7 +39,7 @@ public class ProductSpuController { @PostMapping("/create") @ApiOperation("创建商品spu") @PreAuthorize("@ss.hasPermission('product:spu:create')") - public CommonResult createSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) { + public CommonResult createSpu(@Valid @RequestBody ProductSpuCreateReqVO createReqVO) { return success(spuService.createSpu(createReqVO)); } @@ -52,27 +53,27 @@ public class ProductSpuController { @DeleteMapping("/delete") @ApiOperation("删除商品spu") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Integer.class) + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('product:spu:delete')") - public CommonResult deleteSpu(@RequestParam("id") Integer id) { + public CommonResult deleteSpu(@RequestParam("id") Long id) { spuService.deleteSpu(id); return success(true); } @GetMapping("/get") @ApiOperation("获得商品spu") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Integer.class) + @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('product:spu:query')") - public CommonResult getSpu(@RequestParam("id") Integer id) { + public CommonResult getSpu(@RequestParam("id") Long id) { ProductSpuDO spu = spuService.getSpu(id); return success(ProductSpuConvert.INSTANCE.convert(spu)); } @GetMapping("/list") @ApiOperation("获得商品spu列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) + @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('product:spu:query')") - public CommonResult> getSpuList(@RequestParam("ids") Collection ids) { + public CommonResult> getSpuList(@RequestParam("ids") Collection ids) { List list = spuService.getSpuList(ids); return success(ProductSpuConvert.INSTANCE.convertList(list)); } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java index fb24fbdcf..d641e5384 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuCreateReqVO.java @@ -1,8 +1,11 @@ package cn.iocoder.yudao.module.product.controller.admin.spu.vo; +import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO; import lombok.*; import java.util.*; import io.swagger.annotations.*; + +import javax.validation.Valid; import javax.validation.constraints.*; @ApiModel("管理后台 - 商品spu创建 Request VO") @@ -11,4 +14,8 @@ import javax.validation.constraints.*; @ToString(callSuper = true) public class ProductSpuCreateReqVO extends ProductSpuBaseVO { + @ApiModelProperty(value = "sku组合") + @Valid + List productSkuCreateReqVOS; + } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java index 6faac6586..cb4cd7cb9 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuUpdateReqVO.java @@ -1,8 +1,11 @@ package cn.iocoder.yudao.module.product.controller.admin.spu.vo; +import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO; import lombok.*; import java.util.*; import io.swagger.annotations.*; + +import javax.validation.Valid; import javax.validation.constraints.*; @ApiModel("管理后台 - 商品spu更新 Request VO") @@ -13,6 +16,10 @@ public class SpuUpdateReqVO extends ProductSpuBaseVO { @ApiModelProperty(value = "主键", required = true) @NotNull(message = "主键不能为空") - private Integer id; + private Long id; + + @ApiModelProperty(value = "sku组合") + @Valid + List productSkuCreateReqVOS; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java index 3d6e4bd2b..0aac851c3 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java @@ -2,12 +2,16 @@ package cn.iocoder.yudao.module.product.convert.sku; import java.util.*; +import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.mapstruct.factory.Mappers; import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*; import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO; +import org.springframework.util.StringUtils; /** * 商品sku Convert @@ -19,16 +23,36 @@ public interface ProductSkuConvert { ProductSkuConvert INSTANCE = Mappers.getMapper(ProductSkuConvert.class); + @Mapping(source = "properties", target = "properties", qualifiedByName = "translateStringFromList") ProductSkuDO convert(ProductSkuCreateReqVO bean); + @Mapping(source = "properties", target = "properties", qualifiedByName = "translateStringFromList") ProductSkuDO convert(ProductSkuUpdateReqVO bean); + @Mapping(source = "properties", target = "properties", qualifiedByName = "tokenizeToBeanArray") ProductSkuRespVO convert(ProductSkuDO bean); + @Mapping(source = "properties", target = "properties", qualifiedByName = "tokenizeToExcelBeanArray") + ProductSkuExcelVO convertToExcelVO(ProductSkuDO bean); + List convertList(List list); PageResult convertPage(PageResult page); List convertList02(List list); + @Named("tokenizeToBeanArray") + default List translatePropertyArrayFromString(String properties) { + return JSONUtil.toList(properties, ProductSkuBaseVO.Property.class); + } + + @Named("tokenizeToExcelBeanArray") + default List translateExcelPropertyArrayFromString(String properties) { + return JSONUtil.toList(properties, ProductSkuExcelVO.Property.class); + } + + @Named("translateStringFromList") + default String translatePropertyStringFromList(List properties) { + return JSONUtil.toJsonStr(properties); + } } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java index fb01e2dc2..92efaf0e8 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java @@ -5,9 +5,12 @@ import java.util.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.mapstruct.factory.Mappers; import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*; import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO; +import org.springframework.util.StringUtils; /** * 商品spu Convert @@ -19,16 +22,31 @@ public interface ProductSpuConvert { ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class); + @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "translatePicUrlsFromStringList") ProductSpuDO convert(ProductSpuCreateReqVO bean); + @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "translatePicUrlsFromStringList") ProductSpuDO convert(SpuUpdateReqVO bean); + @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray") SpuRespVO convert(ProductSpuDO bean); + @Mapping(source = "picUrls", target = "picUrls", qualifiedByName = "tokenizeToStringArray") + SpuExcelVO convertToExcelVO(ProductSpuDO bean); + List convertList(List list); PageResult convertPage(PageResult page); List convertList02(List list); + @Named("tokenizeToStringArray") + default List translatePicUrlsArrayFromString(String picUrls) { + return Arrays.asList(StringUtils.tokenizeToStringArray(picUrls, ",")); + } + + @Named("translatePicUrlsFromStringList") + default String translatePicUrlsFromList(List picUrls) { + return StringUtils.collectionToCommaDelimitedString(picUrls); + } } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java index bf5866b77..e9f4d20dc 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java @@ -27,7 +27,7 @@ public class ProductSkuDO extends BaseDO { * 主键 */ @TableId - private Integer id; + private Long id; /** * spu编号 */ @@ -36,7 +36,7 @@ public class ProductSkuDO extends BaseDO { * 规格值数组-json格式， [{propertId: , valueId: }, {propertId: , valueId: }] */ // TODO franky：可以定义一个内部的 Property 类，然后 List - private List properties; + private String properties; /** * 销售价格，单位：分 */ @@ -62,11 +62,5 @@ public class ProductSkuDO extends BaseDO { */ private Integer status; - @Data - public static class Property { - private Integer propertyId; - private Integer valueId; - } - } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java index 1486290ce..6698e7115 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.product.dal.dataobject.spu; +import cn.hutool.log.Log; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; @@ -27,7 +28,7 @@ public class ProductSpuDO extends BaseDO { * 主键 */ @TableId - private Integer id; + private Long id; /** * 商品名称 */ @@ -48,7 +49,7 @@ public class ProductSpuDO extends BaseDO { * 商品主图地址,* 数组，以逗号分隔,最多上传15张 */ // TODO franky：List - private List picUrls; + private String picUrls; /** * 排序字段 */ diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java index b29b3418f..f072c98eb 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryService.java @@ -76,4 +76,10 @@ public interface CategoryService { * @return 商品分类列表 */ List getCategoryTreeList(CategoryTreeListReqVO treeListReqVO); + + /** + * 验证选择的分类的合法性 + * @param categoryId 分类id + */ + void validatedCategoryById(Long categoryId); } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java index 97a0af529..f66a51e5c 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/CategoryServiceImpl.java @@ -65,6 +65,9 @@ public class CategoryServiceImpl implements CategoryService { } private CategoryDO validateCategoryExists(Long id, ErrorCode errorCode) { + if (id == 0) { + return new CategoryDO().setId(id); + } CategoryDO categoryDO = categoryMapper.selectById(id); if (categoryDO == null) { throw exception(errorCode); @@ -72,6 +75,11 @@ public class CategoryServiceImpl implements CategoryService { return categoryDO; } + @Override + public void validatedCategoryById(Long categoryId) { + this.validateCategoryExists(categoryId, CATEGORY_NOT_EXISTS); + } + @Override public CategoryDO getCategory(Long id) { return categoryMapper.selectById(id); diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java index 3cbe595c1..ea0c4651a 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java @@ -19,7 +19,7 @@ public interface ProductSkuService { * @param createReqVO 创建信息 * @return 编号 */ - Integer createSku(@Valid ProductSkuCreateReqVO createReqVO); + Long createSku(@Valid ProductSkuCreateReqVO createReqVO); /** * 更新商品sku @@ -33,7 +33,7 @@ public interface ProductSkuService { * * @param id 编号 */ - void deleteSku(Integer id); + void deleteSku(Long id); /** * 获得商品sku @@ -41,7 +41,7 @@ public interface ProductSkuService { * @param id 编号 * @return 商品sku */ - ProductSkuDO getSku(Integer id); + ProductSkuDO getSku(Long id); /** * 获得商品sku列表 @@ -49,7 +49,7 @@ public interface ProductSkuService { * @param ids 编号 * @return 商品sku列表 */ - List getSkuList(Collection ids); + List getSkuList(Collection ids); /** * 获得商品sku分页 @@ -67,4 +67,9 @@ public interface ProductSkuService { */ List getSkuList(ProductSkuExportReqVO exportReqVO); + /** + *对sku的组合的属性等进行合法性校验 + * @param skuCreateReqList sku组合的集合 + */ + void validatedSkuReq(List skuCreateReqList); } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java index 04bc3e369..c0b90db45 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java @@ -5,6 +5,8 @@ import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; +import java.util.stream.Collectors; + import cn.iocoder.yudao.module.product.controller.admin.sku.vo.*; import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -28,7 +30,7 @@ public class ProductSkuServiceImpl implements ProductSkuService { private ProductSkuMapper ProductSkuMapper; @Override - public Integer createSku(ProductSkuCreateReqVO createReqVO) { + public Long createSku(ProductSkuCreateReqVO createReqVO) { // 插入 ProductSkuDO sku = ProductSkuConvert.INSTANCE.convert(createReqVO); ProductSkuMapper.insert(sku); @@ -46,26 +48,26 @@ public class ProductSkuServiceImpl implements ProductSkuService { } @Override - public void deleteSku(Integer id) { + public void deleteSku(Long id) { // 校验存在 this.validateSkuExists(id); // 删除 ProductSkuMapper.deleteById(id); } - private void validateSkuExists(Integer id) { + private void validateSkuExists(Long id) { if (ProductSkuMapper.selectById(id) == null) { throw exception(SKU_NOT_EXISTS); } } @Override - public ProductSkuDO getSku(Integer id) { + public ProductSkuDO getSku(Long id) { return ProductSkuMapper.selectById(id); } @Override - public List getSkuList(Collection ids) { + public List getSkuList(Collection ids) { return ProductSkuMapper.selectBatchIds(ids); } @@ -79,4 +81,11 @@ public class ProductSkuServiceImpl implements ProductSkuService { return ProductSkuMapper.selectList(exportReqVO); } + @Override + public void validatedSkuReq(List skuCreateReqList) { + // 校验规格属性以及规格值是否存在 + List propertyIds = skuCreateReqList.stream().flatMap(p -> p.getProperties().stream()).map(ProductSkuBaseVO.Property::getPropertyId).collect(Collectors.toList()); + + // 校验是否有重复的sku组合 + } } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java index f0649ffe0..e0a3409b1 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java @@ -19,7 +19,7 @@ public interface ProductSpuService { * @param createReqVO 创建信息 * @return 编号 */ - Integer createSpu(@Valid ProductSpuCreateReqVO createReqVO); + Long createSpu(@Valid ProductSpuCreateReqVO createReqVO); /** * 更新商品spu @@ -33,7 +33,7 @@ public interface ProductSpuService { * * @param id 编号 */ - void deleteSpu(Integer id); + void deleteSpu(Long id); /** * 获得商品spu @@ -41,7 +41,7 @@ public interface ProductSpuService { * @param id 编号 * @return 商品spu */ - ProductSpuDO getSpu(Integer id); + ProductSpuDO getSpu(Long id); /** * 获得商品spu列表 @@ -49,7 +49,7 @@ public interface ProductSpuService { * @param ids 编号 * @return 商品spu列表 */ - List getSpuList(Collection ids); + List getSpuList(Collection ids); /** * 获得商品spu分页 diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java index a978852a6..5ebbabb33 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java @@ -1,7 +1,13 @@ package cn.iocoder.yudao.module.product.service.spu; +import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateReqVO; +import cn.iocoder.yudao.module.product.service.category.CategoryService; +import cn.iocoder.yudao.module.product.service.sku.ProductSkuService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.validation.Valid; + +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -27,10 +33,25 @@ public class ProductSpuServiceImpl implements ProductSpuService { @Resource private ProductSpuMapper ProductSpuMapper; + @Resource + private CategoryService categoryService; + + @Resource + private ProductSkuService productSkuService; + @Override - public Integer createSpu(ProductSpuCreateReqVO createReqVO) { + @Transactional + public Long createSpu(ProductSpuCreateReqVO createReqVO) { + // 校验分类 + categoryService.validatedCategoryById(createReqVO.getCategoryId()); + // 校验SKU + List skuCreateReqList = createReqVO.getProductSkuCreateReqVOS(); + productSkuService.validatedSkuReq(skuCreateReqList); // 插入 ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(createReqVO); + skuCreateReqList.forEach(p -> { + p.setSpuId(spu.getId()); + }); ProductSpuMapper.insert(spu); // 返回 return spu.getId(); @@ -46,26 +67,26 @@ public class ProductSpuServiceImpl implements ProductSpuService { } @Override - public void deleteSpu(Integer id) { + public void deleteSpu(Long id) { // 校验存在 this.validateSpuExists(id); // 删除 ProductSpuMapper.deleteById(id); } - private void validateSpuExists(Integer id) { + private void validateSpuExists(Long id) { if (ProductSpuMapper.selectById(id) == null) { throw exception(SPU_NOT_EXISTS); } } @Override - public ProductSpuDO getSpu(Integer id) { + public ProductSpuDO getSpu(Long id) { return ProductSpuMapper.selectById(id); } @Override - public List getSpuList(Collection ids) { + public List getSpuList(Collection ids) { return ProductSpuMapper.selectBatchIds(ids); } diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java index 475d51614..4253b6fd0 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java +++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java @@ -46,7 +46,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest { ProductSkuCreateReqVO reqVO = randomPojo(ProductSkuCreateReqVO.class); // 调用 - Integer skuId = ProductSkuService.createSku(reqVO); + Long skuId = ProductSkuService.createSku(reqVO); // 断言 assertNotNull(skuId); // 校验记录的属性是否正确 @@ -86,7 +86,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest { ProductSkuDO dbSku = randomPojo(ProductSkuDO.class); ProductSkuMapper.insert(dbSku);// @Sql: 先插入出一条存在的数据 // 准备参数 - Integer id = dbSku.getId(); + Long id = dbSku.getId(); // 调用 ProductSkuService.deleteSku(id); @@ -97,7 +97,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @Test public void testDeleteSku_notExists() { // 准备参数 - Integer id = 1; + Long id = 1L; // 调用, 并断言异常 assertServiceException(() -> ProductSkuService.deleteSku(id), SKU_NOT_EXISTS); diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java index afbbdc027..3ed353e31 100755 --- a/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java +++ b/yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java @@ -46,7 +46,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest { ProductSpuCreateReqVO reqVO = randomPojo(ProductSpuCreateReqVO.class); // 调用 - Integer spuId = spuService.createSpu(reqVO); + Long spuId = spuService.createSpu(reqVO); // 断言 assertNotNull(spuId); // 校验记录的属性是否正确 @@ -86,7 +86,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest { ProductSpuDO dbSpu = randomPojo(ProductSpuDO.class); ProductSpuMapper.insert(dbSpu);// @Sql: 先插入出一条存在的数据 // 准备参数 - Integer id = dbSpu.getId(); + Long id = dbSpu.getId(); // 调用 spuService.deleteSpu(id); @@ -97,7 +97,7 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest { @Test public void testDeleteSpu_notExists() { // 准备参数 - Integer id = 1; + Long id = 1L; // 调用, 并断言异常 assertServiceException(() -> spuService.deleteSpu(id), SPU_NOT_EXISTS); diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue index 21c49e0ed..4fba24ac4 100644 --- a/yudao-ui-admin/src/views/mall/product/spu/index.vue +++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue @@ -95,7 +95,7 @@ - +