feat(修复): 修改部分bug

model/src/main/java/com/atguigu/ssyx/model/product/AttrGroup.java

@@ -11,19 +11,17 @@ import lombok.Data;
 @ApiModel(description = "AttrGroup")
 @TableName("attr_group")
 public class AttrGroup extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-	private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "组名")
+    @TableField("name")
+    private String name;
 
-	@ApiModelProperty(value = "组名")
+    @ApiModelProperty(value = "排序")
-	@TableField("name")
+    @TableField("sort")
-	private String name;
+    private Integer sort;
-
-	@ApiModelProperty(value = "排序")
-	@TableField("sort")
-	private Integer sort;
-
-	@ApiModelProperty(value = "备注")
-	@TableField("remark")
-	private String remark;
 
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
 }

service/service-product/src/main/java/com/atguigu/ssyx/product/controller/FileUploadController.java

@@ -5,15 +5,13 @@ import com.atguigu.ssyx.product.service.FileUploadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-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.multipart.MultipartFile;
 
 @Api(tags = "文件上传接口")
 @RestController
 @RequestMapping("/admin/product")
+@CrossOrigin
 public class FileUploadController {
     @Autowired
     private FileUploadService fileUploadService;

service/service-product/src/main/java/com/atguigu/ssyx/product/controller/SkuInfoController.java

@@ -40,7 +40,7 @@ public class SkuInfoController {
             @ApiParam(name = "limit", value = "每页记录数", required = true)
             @PathVariable Long limit,
 
-            @ApiParam(name = "skuInfoQueryVo", value = "查询对象", required = false)
+            @ApiParam(name = "skuInfoQueryVo", value = "查询对象")
             SkuInfoQueryVo skuInfoQueryVo) {
         Page<SkuInfo> pageParam = new Page<>(page, limit);
         IPage<SkuInfo> pageModel = skuInfoService.selectPage(pageParam, skuInfoQueryVo);

service/service-product/src/main/java/com/atguigu/ssyx/product/service/impl/AttrGroupServiceImpl.java

@@ -4,11 +4,12 @@ import com.atguigu.ssyx.model.product.AttrGroup;
 import com.atguigu.ssyx.product.mapper.AttrGroupMapper;
 import com.atguigu.ssyx.product.service.AttrGroupService;
 import com.atguigu.ssyx.vo.product.AttrGroupQueryVo;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * <p>
@@ -30,9 +31,10 @@ public class AttrGroupServiceImpl extends ServiceImpl<AttrGroupMapper, AttrGroup
      */
     @Override
     public IPage<AttrGroup> selectPage(Page<AttrGroup> pageParam, AttrGroupQueryVo vo) {
-        QueryWrapper<AttrGroup> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<AttrGroup> wrapper = new LambdaQueryWrapper<>();
 
-        wrapper.orderByDesc("id");
+        wrapper.like(!StringUtils.isEmpty(vo.getName()), AttrGroup::getName, vo.getName());
+        wrapper.orderByDesc(AttrGroup::getId);
         return baseMapper.selectPage(pageParam, wrapper);
     }
 }

service/service-product/src/main/java/com/atguigu/ssyx/product/service/impl/SkuInfoServiceImpl.java

@@ -22,6 +22,7 @@ import io.jsonwebtoken.lang.Collections;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -45,6 +46,8 @@ public class SkuInfoServiceImpl extends ServiceImpl<SkuInfoMapper, SkuInfo> impl
     private SkuPosterService skuPosterService;
     @Autowired
     private RabbitService rabbitService;
+    @Autowired
+    private SkuImageService skuImagesService;
 
     /**
      * 获取sku分页列表
@@ -136,40 +139,51 @@ public class SkuInfoServiceImpl extends ServiceImpl<SkuInfoMapper, SkuInfo> impl
      *
      * @param skuInfoVo 商品信息
      */
+    @Transactional
     @Override
     public void updateSkuInfo(SkuInfoVo skuInfoVo) {
-        // 修改sku基本信息
+        Long id = skuInfoVo.getId();
-        SkuInfo skuInfo = new SkuInfo();
+        // 更新sku信息
-        BeanUtils.copyProperties(skuInfo, skuInfo);
+        this.updateById(skuInfoVo);
-        baseMapper.updateById(skuInfo);
 
-        // 海报信息
+        // 保存sku详情
-        Long skuId = skuInfoVo.getId();
+        skuPosterService.remove(new LambdaQueryWrapper<SkuPoster>().eq(SkuPoster::getSkuId, id));
-        // 创建查询条件，并删除之前的海报内容
+        // 保存sku海报
-        LambdaQueryWrapper<SkuPoster> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SkuPoster::getSkuId, skuId);
-        skuPosterService.remove(wrapper);
-
-        // 设置海报图片skuId值，并完成添加
         List<SkuPoster> skuPosterList = skuInfoVo.getSkuPosterList();
         if (!CollectionUtils.isEmpty(skuPosterList)) {
-            skuPosterList.forEach(skuPoster -> skuPoster.setSkuId(skuId));
+            int sort = 1;
+            for (SkuPoster skuPoster : skuPosterList) {
+                skuPoster.setSkuId(id);
+                sort++;
+            }
             skuPosterService.saveBatch(skuPosterList);
         }
 
-        // 商品图片
+        // 删除sku图片
-        skuImageService.remove(Wrappers.<SkuImage>lambdaQuery().eq(SkuImage::getSkuId, skuId));
+        skuImagesService.remove(new LambdaQueryWrapper<SkuImage>().eq(SkuImage::getSkuId, id));
+        // 保存sku图片
         List<SkuImage> skuImagesList = skuInfoVo.getSkuImagesList();
-        if (!Collections.isEmpty(skuImagesList)) {
+        if (!CollectionUtils.isEmpty(skuImagesList)) {
-            skuImagesList.forEach(skuImage -> skuImage.setSkuId(skuId));
+            int sort = 1;
-            skuImageService.saveBatch(skuImagesList);
+            for (SkuImage skuImages : skuImagesList) {
+                skuImages.setSkuId(id);
+                skuImages.setSort(sort);
+                sort++;
+            }
+            skuImagesService.saveBatch(skuImagesList);
         }
 
-        // 商品属性
+        // 删除sku平台属性
-        skuAttrValueService.remove(Wrappers.<SkuAttrValue>lambdaQuery().eq(SkuAttrValue::getSkuId, skuId));
+        skuAttrValueService.remove(new LambdaQueryWrapper<SkuAttrValue>().eq(SkuAttrValue::getSkuId, id));
+        // 保存sku平台属性
         List<SkuAttrValue> skuAttrValueList = skuInfoVo.getSkuAttrValueList();
-        if (!Collections.isEmpty(skuAttrValueList)) {
+        if (!CollectionUtils.isEmpty(skuAttrValueList)) {
-            skuAttrValueList.forEach(skuAttrValue -> skuAttrValue.setSkuId(skuId));
+            int sort = 1;
+            for (SkuAttrValue skuAttrValue : skuAttrValueList) {
+                skuAttrValue.setSkuId(id);
+                skuAttrValue.setSort(sort);
+                sort++;
+            }
             skuAttrValueService.saveBatch(skuAttrValueList);
         }
     }