规格代码相关改版

manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java

@@ -3,8 +3,7 @@ package cn.lili.controller.goods;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.CategorySpecification;
-import cn.lili.modules.goods.entity.vos.CategorySpecificationVO;
-import cn.lili.modules.goods.entity.vos.GoodsSpecValueVO;
+import cn.lili.modules.goods.entity.dos.Specification;
 import cn.lili.modules.goods.service.CategorySpecificationService;
 import cn.lili.modules.goods.service.SpecificationService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -45,15 +44,15 @@ public class CategorySpecificationManagerController {
     @ApiOperation(value = "查询某分类下绑定的规格信息")
     @GetMapping(value = "/{categoryId}")
     @ApiImplicitParam(name = "categoryId", value = "分类id", required = true, dataType = "String", paramType = "path")
-    public List<CategorySpecificationVO> getCategorySpec(@PathVariable String categoryId) {
+    public List<Specification> getCategorySpec(@PathVariable String categoryId) {
         return categorySpecificationService.getCategorySpecList(categoryId);
     }
 
     @ApiOperation(value = "查询某分类下绑定的规格信息,商品操作使用")
     @GetMapping(value = "/goods/{categoryId}")
     @ApiImplicitParam(name = "categoryId", value = "分类id", required = true, dataType = "String", paramType = "path")
-    public List<GoodsSpecValueVO> getSpec(@PathVariable String categoryId) {
-        return specificationService.getGoodsSpecValue(categoryId);
+    public List<Specification> getSpec(@PathVariable String categoryId) {
+        return specificationService.list();
     }
 
 
@@ -71,7 +70,7 @@ public class CategorySpecificationManagerController {
         if (categorySpecs != null && categorySpecs.length > 0) {
             List<CategorySpecification> categorySpecifications = new ArrayList<>();
             for (String categorySpec : categorySpecs) {
-                categorySpecifications.add( new CategorySpecification(categoryId, categorySpec));
+                categorySpecifications.add(new CategorySpecification(categoryId, categorySpec));
             }
             categorySpecificationService.saveBatch(categorySpecifications);
         }

manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java

@@ -1,54 +0,0 @@
-package cn.lili.controller.goods;
-
-
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.goods.entity.dos.SpecValues;
-import cn.lili.modules.goods.service.SpecValuesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 管理端,规格项管理接口
- *
- * @author pikachu
- * @date 2020-02-18 15:18:56
- */
-@RestController
-@Api(tags = "管理端,规格项管理接口")
-@RequestMapping("/manager/goods/specValues")
-public class SpecValuesManagerController {
-
-    @Autowired
-    private SpecValuesService specValuesService;
-
-    @GetMapping(value = "/values/{id}")
-    @ApiImplicitParam(name = "id", value = "规格项ID", required = true, dataType = "String", paramType = "path")
-    @ApiOperation(value = "查询规格值列表")
-    public ResultMessage<List<SpecValues>> list(@PathVariable("id") String id) {
-        return ResultUtil.data(specValuesService.query().eq("spec_id", id).list());
-    }
-
-    @ApiOperation(value = "保存规格值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "specId", value = "商品规格ID", required = true, paramType = "path"),
-            @ApiImplicitParam(name = "specValue", value = "商品项", required = true, allowMultiple = true, paramType = "query")
-    })
-    @PostMapping(value = "/save/{specId}")
-    public ResultMessage<List<SpecValues>> saveSpecValue(@PathVariable String specId,
-                                                         @NotNull(message = "至少添加一个规格值") @RequestParam String[] specValue) {
-        //重新添加
-        List<SpecValues> list = specValuesService.saveSpecValue(specId, specValue);
-        return ResultUtil.data(list);
-
-    }
-
-
-}

manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java

@@ -1,24 +1,21 @@
 package cn.lili.controller.goods;
 
 
-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.utils.PageUtil;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.Specification;
-import cn.lili.modules.goods.entity.dto.SpecificationSearchParams;
-import cn.lili.modules.goods.entity.vos.SpecificationVO;
 import cn.lili.modules.goods.service.SpecificationService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 
@@ -36,54 +33,39 @@ public class SpecificationManagerController {
     @Autowired
     private SpecificationService specificationService;
 
-    @GetMapping(value = "/{id}")
-    @ApiImplicitParam(name = "id", value = "商品规格ID", required = true, dataType = "String", paramType = "path")
-    @ApiOperation(value = "通过id获取商品规格")
-    public ResultMessage<Specification> get(@PathVariable String id) {
-        return ResultUtil.data(specificationService.getSpecification(id));
-    }
 
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @GetMapping("/all")
     @ApiOperation(value = "获取所有可用规格")
     public List<Specification> getAll() {
-        List<Specification> list = specificationService.list(new QueryWrapper<Specification>().eq("delete_flag", 0));
+        List<Specification> list = specificationService.list();
         return list;
     }
 
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value = "分页获取")
-    public ResultMessage<IPage<SpecificationVO>> getByPage(String specId, PageVO pageVo) {
-        SpecificationSearchParams searchParams = new SpecificationSearchParams();
-        searchParams.setSpecId(specId);
-        return ResultUtil.data(specificationService.getSpecificationPage(searchParams, pageVo));
-    }
-
-    @PutMapping
-    @ApiOperation(value = "编辑规格")
-    public ResultMessage<Specification> update(@Valid SpecificationVO parameters) {
-        if (parameters.getStoreId() == null) {
-            parameters.setStoreId("0");
-        }
-        if (specificationService.updateSpecification(parameters)) {
-            return ResultUtil.data(parameters);
-        }
-        throw new ServiceException(ResultCode.SPEC_UPDATE_ERROR);
+    @GetMapping
+    @ApiOperation(value = "搜索规格")
+    public Page<Specification> page(String specName, PageVO page) {
+        LambdaQueryWrapper<Specification> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(specName), Specification::getSpecName, specName);
+        lambdaQueryWrapper.orderByDesc(Specification::getCreateTime);
+        return specificationService.page(PageUtil.initPage(page), lambdaQueryWrapper);
     }
 
     @PostMapping
-    @ApiOperation(value = "添加规格")
-    public ResultMessage<Specification> save(@Valid SpecificationVO parameters) {
-        if (parameters.getStoreId() == null) {
-            parameters.setStoreId("0");
-        }
-        if (specificationService.addSpecification(parameters) != null) {
-            return ResultUtil.data(parameters);
-        }
-        throw new ServiceException(ResultCode.SPEC_SAVE_ERROR);
+    @ApiOperation(value = "保存规格")
+    public ResultMessage<Object> save(Specification specification) {
+        specificationService.save(specification);
+        return ResultUtil.success();
     }
 
-    @DeleteMapping(value = "/{ids}")
+    @PutMapping("/{id}")
+    @ApiOperation(value = "更改规格")
+    public ResultMessage<Object> update(Specification specification, @PathVariable String id) {
+        specification.setId(id);
+        specificationService.saveOrUpdate(specification);
+        return ResultUtil.success();
+    }
+
+    @DeleteMapping("/{ids}")
     @ApiImplicitParam(name = "ids", value = "规格ID", required = true, dataType = "String", allowMultiple = true, paramType = "path")
     @ApiOperation(value = "批量删除")
     public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {