规格增删改查接口及页面提交

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java

@@ -63,8 +63,7 @@ public class ProductPropertyController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('product:property:query')")
     public CommonResult<ProductPropertyRespVO> getProperty(@RequestParam("id") Long id) {
-        ProductPropertyDO property = productPropertyService.getProperty(id);
-        return success(ProductPropertyConvert.INSTANCE.convert(property));
+        return success(productPropertyService.getPropertyResp(id));
     }
 
     @GetMapping("/list")
@@ -80,8 +79,7 @@ public class ProductPropertyController {
     @ApiOperation("获得规格名称分页")
     @PreAuthorize("@ss.hasPermission('product:property:query')")
     public CommonResult<PageResult<ProductPropertyRespVO>> getPropertyPage(@Valid ProductPropertyPageReqVO pageVO) {
-        PageResult<ProductPropertyDO> pageResult = productPropertyService.getPropertyPage(pageVO);
-        return success(ProductPropertyConvert.INSTANCE.convertPage(pageResult));
+        return success(productPropertyService.getPropertyListPage(pageVO));
     }
 
     @GetMapping("/export-excel")

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyCreateReqVO.java

@@ -1,12 +1,20 @@
 package cn.iocoder.yudao.module.product.controller.admin.property.vo;
 
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueCreateReqVO;
 import lombok.*;
 import io.swagger.annotations.*;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 @ApiModel("管理后台 - 规格名称创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductPropertyCreateReqVO extends ProductPropertyBaseVO {
 
+    @ApiModelProperty(value = "属性值")
+    @NotNull(message = "属性值不能为空")
+    List<PropertyValueCreateReqVO> propertyValueList;
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyRespVO.java

@@ -17,6 +17,7 @@ public class ProductPropertyRespVO extends ProductPropertyBaseVO {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
-    private List<PropertyValueRespVO> propertyValueRespVOList;
+    @ApiModelProperty(value = "属性值")
+    private List<PropertyValueRespVO> propertyValueList;
 
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyUpdateReqVO.java

@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.product.controller.admin.property.vo;
 
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueCreateReqVO;
 import lombok.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;
+import java.util.List;
 
 @ApiModel("管理后台 - 规格名称更新 Request VO")
 @Data
@@ -14,4 +16,8 @@ public class ProductPropertyUpdateReqVO extends ProductPropertyBaseVO {
     @NotNull(message = "主键不能为空")
     private Long id;
 
+    @ApiModelProperty(value = "属性值")
+    @NotNull(message = "属性值不能为空")
+    List<PropertyValueCreateReqVO> propertyValueList;
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/propertyvalue/PropertyValueController.java

@@ -1,100 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.propertyvalue;
-
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.annotations.*;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.propertyvalue.PropertyValueDO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.PropertyValueConvert;
-import cn.iocoder.yudao.module.product.service.propertyvalue.PropertyValueService;
-
-@Api(tags = "管理后台 - 规格值")
-@RestController
-@RequestMapping("/product/property-value")
-@Validated
-public class PropertyValueController {
-
-    @Resource
-    private PropertyValueService propertyValueService;
-
-    @PostMapping("/create")
-    @ApiOperation("创建规格值")
-    @PreAuthorize("@ss.hasPermission('product:property-value:create')")
-    public CommonResult<Integer> createPropertyValue(@Valid @RequestBody PropertyValueCreateReqVO createReqVO) {
-        return success(propertyValueService.createPropertyValue(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新规格值")
-    @PreAuthorize("@ss.hasPermission('product:property-value:update')")
-    public CommonResult<Boolean> updatePropertyValue(@Valid @RequestBody PropertyValueUpdateReqVO updateReqVO) {
-        propertyValueService.updatePropertyValue(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除规格值")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Integer.class)
-    @PreAuthorize("@ss.hasPermission('product:property-value:delete')")
-    public CommonResult<Boolean> deletePropertyValue(@RequestParam("id") Integer id) {
-        propertyValueService.deletePropertyValue(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得规格值")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Integer.class)
-    @PreAuthorize("@ss.hasPermission('product:property-value:query')")
-    public CommonResult<PropertyValueRespVO> getPropertyValue(@RequestParam("id") Integer id) {
-        PropertyValueDO propertyValue = propertyValueService.getPropertyValue(id);
-        return success(PropertyValueConvert.INSTANCE.convert(propertyValue));
-    }
-
-    @GetMapping("/list")
-    @ApiOperation("获得规格值列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('product:property-value:query')")
-    public CommonResult<List<PropertyValueRespVO>> getPropertyValueList(@RequestParam("ids") Collection<Integer> ids) {
-        List<PropertyValueDO> list = propertyValueService.getPropertyValueList(ids);
-        return success(PropertyValueConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @ApiOperation("获得规格值分页")
-    @PreAuthorize("@ss.hasPermission('product:property-value:query')")
-    public CommonResult<PageResult<PropertyValueRespVO>> getPropertyValuePage(@Valid PropertyValuePageReqVO pageVO) {
-        PageResult<PropertyValueDO> pageResult = propertyValueService.getPropertyValuePage(pageVO);
-        return success(PropertyValueConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/export-excel")
-    @ApiOperation("导出规格值 Excel")
-    @PreAuthorize("@ss.hasPermission('product:property-value:export')")
-    @OperateLog(type = EXPORT)
-    public void exportPropertyValueExcel(@Valid PropertyValueExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<PropertyValueDO> list = propertyValueService.getPropertyValueList(exportReqVO);
-        // 导出 Excel
-        List<PropertyValueExcelVO> datas = PropertyValueConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "规格值.xls", "数据", PropertyValueExcelVO.class, datas);
-    }
-
-}

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/propertyvalue/PropertyValueConvert.java

@@ -31,4 +31,6 @@ public interface PropertyValueConvert {
 
     List<PropertyValueExcelVO> convertList02(List<PropertyValueDO> list);
 
+    List<PropertyValueDO> convertList03(List<PropertyValueCreateReqVO> list);
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/propertyvalue/PropertyValueMapper.java

@@ -35,4 +35,14 @@ public interface PropertyValueMapper extends BaseMapperX<PropertyValueDO> {
                 .orderByDesc(PropertyValueDO::getId));
     }
 
+    default List<PropertyValueDO> getPropertyValueListByPropertyId(List<Long> propertyIds){
+        return selectList(new LambdaQueryWrapperX<PropertyValueDO>()
+                .inIfPresent(PropertyValueDO::getPropertyId, propertyIds));
+    }
+
+    default void deletePropertyValueByPropertyId(Long propertyId){
+        LambdaQueryWrapperX<PropertyValueDO> queryWrapperX = new LambdaQueryWrapperX<>();
+        queryWrapperX.eq(PropertyValueDO::getPropertyId, propertyId).eq(PropertyValueDO::getDeleted, false);
+        delete(queryWrapperX);
+    }
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java

@@ -67,4 +67,13 @@ public interface ProductPropertyService {
      */
     List<ProductPropertyDO> getPropertyList(ProductPropertyExportReqVO exportReqVO);
 
+    /**
+     * 获取属性及属性值列表 分页
+     * @param pageReqVO
+     * @return
+     */
+    PageResult<ProductPropertyRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO);
+
+    ProductPropertyRespVO getPropertyResp(Long id);
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java

@@ -4,15 +4,23 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.*;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueRespVO;
 import cn.iocoder.yudao.module.product.convert.property.ProductPropertyConvert;
+import cn.iocoder.yudao.module.product.convert.propertyvalue.PropertyValueConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.propertyvalue.PropertyValueDO;
 import cn.iocoder.yudao.module.product.dal.mysql.property.ProductPropertyMapper;
+import cn.iocoder.yudao.module.product.service.propertyvalue.PropertyValueService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PROPERTY_NOT_EXISTS;
@@ -29,22 +37,39 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
     @Resource
     private ProductPropertyMapper productPropertyMapper;
 
+    @Resource
+    private PropertyValueService propertyValueService;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long createProperty(ProductPropertyCreateReqVO createReqVO) {
         // 插入
         ProductPropertyDO property = ProductPropertyConvert.INSTANCE.convert(createReqVO);
         productPropertyMapper.insert(property);
+
+        //插入属性值
+        List<PropertyValueCreateReqVO> propertyValueList = createReqVO.getPropertyValueList();
+        List<PropertyValueDO> propertyValueDOList = PropertyValueConvert.INSTANCE.convertList03(propertyValueList);
+        propertyValueDOList.stream().forEach(x-> x.setPropertyId(property.getId()));
+        propertyValueService.batchInsert(propertyValueDOList);
         // 返回
         return property.getId();
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateProperty(ProductPropertyUpdateReqVO updateReqVO) {
         // 校验存在
         this.validatePropertyExists(updateReqVO.getId());
         // 更新
         ProductPropertyDO updateObj = ProductPropertyConvert.INSTANCE.convert(updateReqVO);
         productPropertyMapper.updateById(updateObj);
+        //更新属性值，先删后加
+        propertyValueService.deletePropertyValueByPropertyId(updateReqVO.getId());
+        List<PropertyValueCreateReqVO> propertyValueList = updateReqVO.getPropertyValueList();
+        List<PropertyValueDO> propertyValueDOList = PropertyValueConvert.INSTANCE.convertList03(propertyValueList);
+        propertyValueDOList.stream().forEach(x-> x.setPropertyId(updateReqVO.getId()));
+        propertyValueService.batchInsert(propertyValueDOList);
     }
 
     @Override
@@ -53,6 +78,8 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         this.validatePropertyExists(id);
         // 删除
         productPropertyMapper.deleteById(id);
+        //同步删除属性值
+        propertyValueService.deletePropertyValueByPropertyId(id);
     }
 
     private void validatePropertyExists(Long id) {
@@ -81,4 +108,36 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         return productPropertyMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public PageResult<ProductPropertyRespVO> getPropertyListPage(ProductPropertyPageReqVO pageReqVO) {
+        //获取属性列表
+        PageResult<ProductPropertyDO> pageResult = productPropertyMapper.selectPage(pageReqVO);
+        PageResult<ProductPropertyRespVO> propertyRespVOPageResult = ProductPropertyConvert.INSTANCE.convertPage(pageResult);
+        List<Long> propertyIds = propertyRespVOPageResult.getList().stream().map(x -> x.getId()).collect(Collectors.toList());
+
+        //获取属性值列表
+        List<PropertyValueDO> propertyValueDOList = propertyValueService.getPropertyValueListByPropertyId(propertyIds);
+        List<PropertyValueRespVO> propertyValueRespVOList = PropertyValueConvert.INSTANCE.convertList(propertyValueDOList);
+        //组装一对多
+        propertyRespVOPageResult.getList().stream().forEach(x->{
+            Long propertyId = x.getId();
+            List<PropertyValueRespVO> valueDOList = propertyValueRespVOList.stream().filter(v -> v.getPropertyId().equals(propertyId)).collect(Collectors.toList());
+            x.setPropertyValueList(valueDOList);
+        });
+        return propertyRespVOPageResult;
+    }
+
+    @Override
+    public ProductPropertyRespVO getPropertyResp(Long id) {
+        //查询规格
+        ProductPropertyDO property = getProperty(id);
+        ProductPropertyRespVO propertyRespVO = ProductPropertyConvert.INSTANCE.convert(property);
+        //查询属性值
+        List<PropertyValueDO> valueDOList = propertyValueService.getPropertyValueListByPropertyId(Arrays.asList(id));
+        List<PropertyValueRespVO> propertyValueRespVOS = PropertyValueConvert.INSTANCE.convertList(valueDOList);
+        //组装
+        propertyRespVO.setPropertyValueList(propertyValueRespVOS);
+        return propertyRespVO;
+    }
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/propertyvalue/PropertyValueService.java

@@ -67,4 +67,22 @@ public interface PropertyValueService {
      */
     List<PropertyValueDO> getPropertyValueList(PropertyValueExportReqVO exportReqVO);
 
+    /**
+     * 批量插入属性值
+     * @param propertyValues
+     */
+    void batchInsert(List<PropertyValueDO> propertyValues);
+
+    /**
+     * 根据属性id查询
+     * @param propertyIds
+     * @return
+     */
+    List<PropertyValueDO> getPropertyValueListByPropertyId(List<Long> propertyIds);
+
+    /**
+     * 根据属性id 删除
+     * @param propertyId
+     */
+    void deletePropertyValueByPropertyId(Long propertyId);
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/propertyvalue/PropertyValueServiceImpl.java

@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.product.service.propertyvalue;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueCreateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueExportReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValuePageReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.PropertyValueUpdateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.propertyvalue.vo.*;
 import cn.iocoder.yudao.module.product.convert.propertyvalue.PropertyValueConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.propertyvalue.PropertyValueDO;
 import cn.iocoder.yudao.module.product.dal.mysql.propertyvalue.PropertyValueMapper;
@@ -84,4 +81,19 @@ public class PropertyValueServiceImpl implements PropertyValueService {
         return propertyValueMapper.selectList(exportReqVO);
     }
 
+    @Override
+    public void batchInsert(List<PropertyValueDO> propertyValues) {
+        propertyValueMapper.insertBatch(propertyValues);
+    }
+
+    @Override
+    public List<PropertyValueDO> getPropertyValueListByPropertyId(List<Long> propertyIds) {
+        return propertyValueMapper.getPropertyValueListByPropertyId(propertyIds);
+    }
+
+    @Override
+    public void deletePropertyValueByPropertyId(Long propertyId) {
+        propertyValueMapper.deletePropertyValueByPropertyId(propertyId);
+    }
+
 }