update

修改路径

src/main/java/com/mmc/pms/service/Impl/BackstageTaskServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.HttpMethod;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.mmc.pms.auth.dto.CompanyInfoDTO;
@@ -25,21 +24,15 @@ import com.mmc.pms.model.work.vo.UpAndDownServiceVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.BackstageTaskService;
 import com.mmc.pms.service.InspComtService;
-import feign.Feign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.MultiValueMap;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
@@ -65,7 +58,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
 
   @Autowired private RedisTemplate redisTemplate;
 
-
   @Override
   public ResultBody addWorkService(ServiceVO param, Integer userAccountId) {
     ServiceDO serviceDO = new ServiceDO(param, userAccountId);
@@ -89,13 +81,16 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
   }
 
   @Override
-  public ResultBody<ServiceDTO> queryById(Integer id,HttpServletRequest request) {
+  public ResultBody<ServiceDTO> queryById(Integer id, HttpServletRequest request) {
     ServiceDO serviceDO = backstageTaskServiceDao.queryById(id);
-    String token = userAppApi.getCompanyInfoById(serviceDO.getCompanyId(), request.getHeader("token"));
+    String token =
+        userAppApi.getCompanyInfoById(serviceDO.getCompanyId(), request.getHeader("token"));
     JSONObject jsonObject = JSONObject.parseObject(token);
-    CompanyInfoDTO companyInfoDTO = JSON.parseObject(String.valueOf((JSONObject) jsonObject.get("result")), CompanyInfoDTO.class);
+    CompanyInfoDTO companyInfoDTO =
+        JSON.parseObject(
+            String.valueOf((JSONObject) jsonObject.get("result")), CompanyInfoDTO.class);
     String companyName = companyInfoDTO.getCompanyName();
-    ServiceDTO serviceDTO = new ServiceDTO(serviceDO,companyName);
+    ServiceDTO serviceDTO = new ServiceDTO(serviceDO, companyName);
     Map<Integer, String> categoriesNameMap =
         getCategoriesNameByIds(
             Arrays.asList(serviceDTO.getApplicationId(), serviceDTO.getIndustryId()));
@@ -109,8 +104,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
     return ResultBody.success(serviceDTO);
   }
 
-
-
   private Map<Integer, String> getCategoriesNameByIds(List<Integer> ids) {
     if (CollectionUtils.isEmpty(ids)) {
       return new HashMap<>();
@@ -128,7 +121,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
   }
 
   @Override
-  public PageResult queryServiceManagerList(ServiceQO param, Integer userAccountId, CompanyInfoVO companyInfoVO) {
+  public PageResult queryServiceManagerList(
+      ServiceQO param, Integer userAccountId, CompanyInfoVO companyInfoVO) {
     int count = backstageTaskServiceDao.count(param);
     if (count == 0) {
       return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
@@ -181,9 +175,9 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
       return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
     }
     List<ServiceDO> pageList =
-            backstageTaskServiceDao.queryPageByLimit(param, categoriesIds, userIds);
+        backstageTaskServiceDao.queryPageByLimit(param, categoriesIds, userIds);
 
-    List<WorkServiceDTO> workServiceDTOList = getWorkServiceDTOS(pageList,request);
+    List<WorkServiceDTO> workServiceDTOList = getWorkServiceDTOS(pageList, request);
     return PageResult.buildPage(pageNo, param.getPageSize(), count, workServiceDTOList);
   }
 
@@ -210,20 +204,26 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
 
   @Override
   public ResultBody queryByIdCount(Integer companyId) {
-    return ResultBody.success(backstageTaskServiceDao.queryByIdCount( companyId));
+    return ResultBody.success(backstageTaskServiceDao.queryByIdCount(companyId));
   }
 
-  private List<WorkServiceDTO> getWorkServiceDTOS(List<ServiceDO> pageList,HttpServletRequest request) {
-    String companyInfoVOS= userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token") );
+  private List<WorkServiceDTO> getWorkServiceDTOS(
+      List<ServiceDO> pageList, HttpServletRequest request) {
+    String companyInfoVOS =
+        userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token"));
     JSONObject jsonObject = JSON.parseObject(companyInfoVOS);
     JSONObject jsonObject1 = JSON.parseObject(String.valueOf(jsonObject.get("result")));
-    List<CompanyInfoVO> companyInfoList = new Gson().fromJson(new Gson().toJson(jsonObject1.get("list")), new TypeToken<List<CompanyInfoVO>>(){}.getType());
+    List<CompanyInfoVO> companyInfoList =
+        new Gson()
+            .fromJson(
+                new Gson().toJson(jsonObject1.get("list")),
+                new TypeToken<List<CompanyInfoVO>>() {}.getType());
     String companyName = "";
     List<WorkServiceDTO> workServiceDTOList = new ArrayList<>();
     for (ServiceDO item : pageList) {
       for (CompanyInfoVO companyInfoVO : companyInfoList) {
-        if (item.getCompanyId().equals(companyInfoVO.getId())){
-          companyName=companyInfoVO.getCompanyName();
+        if (item.getCompanyId().equals(companyInfoVO.getId())) {
+          companyName = companyInfoVO.getCompanyName();
         }
       }
       List<InspComtDO> inspComtDOS = generateComments(item);

src/main/java/com/mmc/pms/service/Impl/BrandManageServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
@@ -17,82 +17,78 @@ import java.util.stream.Collectors;
 
 /**
  * @Author LW
- * @date 2023/3/14 13:27
- * 概要：
+ *
+ * @date 2023/3/14 13:27 概要：
  */
 @Service
 public class BrandManageServiceImpl implements BrandManageService {
 
-    @Autowired
-    private BrandManageDao brandManageDao;
-    @Resource
-    private ProductDao productDao;
+  @Autowired private BrandManageDao brandManageDao;
+  @Resource private ProductDao productDao;
 
-
-    /**
-     * 添加品牌信息
-     *
-     * @param brandName 品牌名称
-     * @return {@link ResultBody}
-     */
-    @Override
-    public ResultBody addBrandInfo(String brandName) {
-        // 根据品牌名称判断是否存在
-        int count = brandManageDao.countBrandInfoByName(null, brandName);
-        if (count > 0) {
-            return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
-        }
-        BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
-        brandManageDao.insertBrandInfo(brandInfoDO);
-        return ResultBody.success();
+  /**
+   * 添加品牌信息
+   *
+   * @param brandName 品牌名称
+   * @return {@link ResultBody}
+   */
+  @Override
+  public ResultBody addBrandInfo(String brandName) {
+    // 根据品牌名称判断是否存在
+    int count = brandManageDao.countBrandInfoByName(null, brandName);
+    if (count > 0) {
+      return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
     }
+    BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
+    brandManageDao.insertBrandInfo(brandInfoDO);
+    return ResultBody.success();
+  }
 
-    /**
-     * 品牌列表信息
-     *
-     * @return {@link ResultBody}
-     */
-    @Override
-    public PageResult listBrandInfo(Integer pageNo, Integer pageSize) {
-        int count = brandManageDao.countBrandInfo();
-        if (count == 0) {
-            return PageResult.buildPage(pageNo, pageSize, 0);
-        }
-        int itemIndex = (pageNo - 1) * pageSize;
-        List<BrandInfoDO> brandInfo = brandManageDao.listBrandInfo(itemIndex, pageSize);
-        List<BrandInfoDTO> brandInfoList = brandInfo.stream()
-                .map(BrandInfoDO::buildBrandInfoDTO)
-                .collect(Collectors.toList());
-        return PageResult.buildPage(pageNo, pageSize, count, brandInfoList);
+  /**
+   * 品牌列表信息
+   *
+   * @return {@link ResultBody}
+   */
+  @Override
+  public PageResult listBrandInfo(Integer pageNo, Integer pageSize) {
+    int count = brandManageDao.countBrandInfo();
+    if (count == 0) {
+      return PageResult.buildPage(pageNo, pageSize, 0);
     }
+    int itemIndex = (pageNo - 1) * pageSize;
+    List<BrandInfoDO> brandInfo = brandManageDao.listBrandInfo(itemIndex, pageSize);
+    List<BrandInfoDTO> brandInfoList =
+        brandInfo.stream().map(BrandInfoDO::buildBrandInfoDTO).collect(Collectors.toList());
+    return PageResult.buildPage(pageNo, pageSize, count, brandInfoList);
+  }
 
-    /**
-     * 删除品牌信息
-     *
-     * @param id id
-     * @return {@link ResultBody}
-     */
-    @Override
-    public ResultBody deleteBrandInfo(Integer id) {
-        // 判断该品牌是否绑定产品信息
-        int count = productDao.countProductSpecByBrandId(id);
-        if (count > 0) {
-            return ResultBody.error(ResultEnum.BRAND_DELETE_FAIL);
-        }
-        brandManageDao.removeBrandInfoById(id);
-        return ResultBody.success();
+  /**
+   * 删除品牌信息
+   *
+   * @param id id
+   * @return {@link ResultBody}
+   */
+  @Override
+  public ResultBody deleteBrandInfo(Integer id) {
+    // 判断该品牌是否绑定产品信息
+    int count = productDao.countProductSpecByBrandId(id);
+    if (count > 0) {
+      return ResultBody.error(ResultEnum.BRAND_DELETE_FAIL);
     }
+    brandManageDao.removeBrandInfoById(id);
+    return ResultBody.success();
+  }
 
-    @Override
-    public ResultBody editBrandInfo(Integer id, String brandName) {
-        // 根据品牌名称判断是否存在
-        int count = brandManageDao.countBrandInfoByName(id, brandName);
-        if (count > 0) {
-            return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
-        }
-        BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
-        brandInfoDO.setId(id);
-        brandManageDao.updateBrandInfo(brandInfoDO);
-        return ResultBody.success();
+  @Override
+  public ResultBody editBrandInfo(Integer id, String brandName) {
+    // 根据品牌名称判断是否存在
+    int count = brandManageDao.countBrandInfoByName(id, brandName);
+    if (count > 0) {
+      return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
     }
+    BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
+    brandInfoDO.setId(id);
+    brandManageDao.updateBrandInfo(brandInfoDO);
+    return ResultBody.success();
+  }
 }

src/main/java/com/mmc/pms/service/Impl/CategoriesServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mmc.pms.common.ResultBody;

src/main/java/com/mmc/pms/service/Impl/GoodsInfoServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
 import com.mmc.pms.dao.GoodsInfoDao;
@@ -26,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author 23214
@@ -46,7 +44,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public ResultBody addGoods(GoodsAddVO goodsAddVO) {
+  public ResultBody addGoods(GoodsAddVO goodsAddVO, Integer userAccountId) {
     // 判断商品名称是否存在
     if (goodsInfoDao.countGoodsInfoByName(goodsAddVO) > 0) {
       return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
@@ -118,10 +116,10 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     for (GoodsProdSpecVO goodsSpecVO : goodsSpecList) {
       MallProdInfoDO mallProdSkuInfoDO =
           new MallProdInfoDO(goodsSpecVO)
-              .setProdSkuId(goodsSpecVO.getSkuId())
+              .setProductId(goodsSpecVO.getSkuId())
               .setGoodsInfoId(goodsInfo.getId());
       // 插入数据库商品对应的sku信息
-      goodsInfoDao.insertMallProdSkuInfo(mallProdSkuInfoDO);
+      productDao.insertMallProdSkuInfo(mallProdSkuInfoDO);
       for (MallProductSpecVO mallProductSpecVO : goodsSpecVO.getSpecIds()) {
         // 构建商品对应的规格信息
         MallProdSkuInfoSpecDO mallProdSkuInfoSpecDO =
@@ -140,7 +138,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
       GoodsInfo goodsInfo, GoodsProdSpecVO goodsSpec, Integer id) {
     MallProdInfoDO mallProdInfoDO = new MallProdInfoDO();
     mallProdInfoDO.setGoodsInfoId(goodsInfo.getId());
-    mallProdInfoDO.setProdSkuId(id);
+    mallProdInfoDO.setProductId(id);
     mallProdInfoDO.setProdSkuSpecName(goodsSpec.getGoodsSpecName());
     mallProdInfoDO.setCategoriesId(goodsSpec.getCategoryId());
     mallProdInfoDO.setChooseType(goodsSpec.getChooseType());
@@ -155,12 +153,8 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     // 遍历自定义规格信息
     for (GoodsProdSpecVO productSpec : customGoodsSpecList) {
       // 构建商品对应的sku信息
-      ProductSkuDO productSkuDO =
-          new ProductSkuDO()
-              .setCategoriesId(productSpec.getCategoryId())
-              .setProductName(productSpec.getProductName())
-              .setCustomize(1)
-              .setDirectoryId(goodsInfo.getDirectoryId());
+      ProductDO productSkuDO =
+          new ProductDO().setProductName(productSpec.getProductName()).setCustomize(1);
       // 插入产品sku信息
       productDao.insertProductSku(productSkuDO);
       MallProdInfoDO mallProdInfoDO =
@@ -173,7 +167,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
               param -> {
                 ProductSpecDO productSpecDO =
                     new ProductSpecDO()
-                        .setProductSkuId(productSkuDO.getId())
+                        .setProductId(productSkuDO.getId())
                         .setVersionDesc("自定义")
                         .setSpecImage(param.getSpecImage())
                         .setSpecName(param.getSpecName())
@@ -416,7 +410,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
                     MallProdInfoDO mallProdInfoDO = new MallProdInfoDO();
                     mallProdInfoDO
                         .setId(d.getId())
-                        .setProdSkuId(d.getSkuId())
+                        .setProductId(d.getSkuId())
                         .setCategoriesId(d.getCategoryId())
                         .setProdSkuSpecName(d.getGoodsSpecName())
                         .setChooseType(d.getChooseType())
@@ -503,13 +497,10 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
               .map(
                   d -> {
                     // 构建商品对应的sku信息
-                    ProductSkuDO productSkuDO =
-                        new ProductSkuDO()
-                            .setId(d.getSkuId())
-                            .setCategoriesId(d.getCategoryId())
-                            .setProductName(d.getProductName());
+                    ProductDO productSkuDO =
+                        new ProductDO().setId(d.getSkuId()).setProductName(d.getProductName());
                     productDao.updateProductSku(productSkuDO);
-                    return new MallProdInfoDO(d).setId(d.getId()).setProdSkuId(d.getSkuId());
+                    return new MallProdInfoDO(d).setId(d.getId()).setProductId(d.getSkuId());
                   })
               .collect(Collectors.toList());
       // 批量修改sku的信息
@@ -949,9 +940,11 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
     // 查询商品信息
     List<OrderGoodsProdDTO> orderGoodsProdDTOList =
         productDao.listProdGoodsSkuInfo(mallOrderGoodsInfoQO);
-    //填充价格
-    List<ProductSpecPriceDO> allProductSpecPriceDOS = productDao.listAllProductSpecPriceByType(prodSkuSpecIds);
-    this.buildProductSpecPrice(orderGoodsProdDTOList, allProductSpecPriceDOS, mallOrderGoodsInfoQO.getCooperationTagIds());
+    // 填充价格
+    List<ProductSpecPriceDO> allProductSpecPriceDOS =
+        productDao.listAllProductSpecPriceByType(prodSkuSpecIds);
+    this.buildProductSpecPrice(
+        orderGoodsProdDTOList, allProductSpecPriceDOS, mallOrderGoodsInfoQO.getCooperationTagIds());
     // 还需配置商品规格金额， 单个商品skuSpecAmount， 全部小sku金额
     List<Integer> goodsIds =
         orderGoodsProdDTOList.stream()
@@ -983,19 +976,26 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
   /**
    * 填充产品规格价格
+   *
    * @param orderGoodsProdDTOList
    * @param allProductSpecPriceDOS
    * @param cooperationTagIds
    */
-  private void buildProductSpecPrice(List<OrderGoodsProdDTO> orderGoodsProdDTOList, List<ProductSpecPriceDO> allProductSpecPriceDOS,
-                                     List<Integer> cooperationTagIds){
-    Map<Integer, List<ProductSpecPriceDO>> productSpecPriceMap = allProductSpecPriceDOS.stream()
+  private void buildProductSpecPrice(
+      List<OrderGoodsProdDTO> orderGoodsProdDTOList,
+      List<ProductSpecPriceDO> allProductSpecPriceDOS,
+      List<Integer> cooperationTagIds) {
+    Map<Integer, List<ProductSpecPriceDO>> productSpecPriceMap =
+        allProductSpecPriceDOS.stream()
             .collect(Collectors.groupingBy(ProductSpecPriceDO::getProductSpecId));
     for (OrderGoodsProdDTO orderGoodsProdDTO : orderGoodsProdDTOList) {
-      for (OrderGoodsProdDetailDTO prodDetailDTO : orderGoodsProdDTO.getOrderGoodsProdDetailDTOS()) {
-        List<ProductSpecPriceDO> specPriceDOS = productSpecPriceMap.get(prodDetailDTO.getProductSpecId());
+      for (OrderGoodsProdDetailDTO prodDetailDTO :
+          orderGoodsProdDTO.getOrderGoodsProdDetailDTOS()) {
+        List<ProductSpecPriceDO> specPriceDOS =
+            productSpecPriceMap.get(prodDetailDTO.getProductSpecId());
         if (CollectionUtils.isNotEmpty(specPriceDOS)) {
-          List<ProductSpecPriceDO> tempSpecPrice = specPriceDOS.stream()
+          List<ProductSpecPriceDO> tempSpecPrice =
+              specPriceDOS.stream()
                   .filter(d -> cooperationTagIds.contains(d.getCooperationTag()))
                   .sorted(Comparator.comparing(ProductSpecPriceDO::getPrice))
                   .collect(Collectors.toList());

src/main/java/com/mmc/pms/service/Impl/InspComtServiceImpl.java

-package com.mmc.pms.service.Impl;
-
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.dao.InspComtDao;
 import com.mmc.pms.entity.InspComtDO;
@@ -10,9 +9,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * <p>
  * 评论表 服务实现类
- * </p>
  *
  * @author Pika
  * @since 2023-06-09
@@ -20,11 +17,10 @@ import java.util.List;
 @Service
 public class InspComtServiceImpl implements InspComtService {
 
-    @Autowired
-    private InspComtDao inspComtDao;
+  @Autowired private InspComtDao inspComtDao;
 
-    @Override
-    public List<InspComtDO> randomGetInspComtList(Integer size) {
-        return inspComtDao.randomGetInspComtList(size);
-    }
+  @Override
+  public List<InspComtDO> randomGetInspComtList(Integer size) {
+    return inspComtDao.randomGetInspComtList(size);
+  }
 }

src/main/java/com/mmc/pms/service/Impl/MiniProgramProductMallServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
@@ -100,7 +100,7 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall
                     GoodsSpecDTO goodsSpecDTO = new GoodsSpecDTO();
                     goodsSpecDTO
                         .setId(d.getId())
-                        .setSkuId(d.getProdSkuId())
+                        .setSkuId(d.getProductId())
                         .setGoodsSpecName(d.getProdSkuSpecName())
                         .setSkuName(d.getProductSkuName())
                         .setBrandInfoId(d.getBrandInfoId())
@@ -190,7 +190,7 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall
                       return productSpecVO;
                     })
                 .collect(Collectors.toList());
-        ProductSkuDO productSkuDetail =
+        ProductDO productSkuDetail =
             goodsInfoDao.getProductSkuDetail(industryProductInventoryDO.getProductSkuId());
         GoodsProductSkuVO goodsProductSkuVO = new GoodsProductSkuVO();
         BeanUtils.copyProperties(productSkuDetail, goodsProductSkuVO);

src/main/java/com/mmc/pms/service/Impl/ProductServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
@@ -37,7 +37,7 @@ public class ProductServiceImpl implements ProductSkuService {
     if (count > 0) {
       return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
     }
-    ProductSkuDO productSkuDO = new ProductSkuDO(param);
+    ProductDO productSkuDO = new ProductDO(param);
     productSkuDO.setCustomize(0);
     // 新增产品sku
     int status = productDao.insertProductSku(productSkuDO);
@@ -50,11 +50,11 @@ public class ProductServiceImpl implements ProductSkuService {
   @Override
   public ResultBody getProductSkuDetail(Integer id) {
     // 校验此sku是否还存在或已删除
-    int count = productDao.countSkuIsExist(id);
+    int count = productDao.countProductIsExist(id);
     if (count <= 0) {
-      return ResultBody.error(ResultEnum.SKU_DOES_NOT_EXIST_OR_HAS_BEEN_DELETED);
+      return ResultBody.error(ResultEnum.PRODUCT_DOES_NOT_EXIST_OR_HAS_BEEN_DELETED);
     }
-    ProductSkuDO productSkuDO = productDao.getProductSkuDetail(id);
+    ProductDO productSkuDO = productDao.getProductDetail(id);
     return ResultBody.success(productSkuDO.buildProductSkuDTO());
   }
 
@@ -65,7 +65,7 @@ public class ProductServiceImpl implements ProductSkuService {
     if (count > 0) {
       return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
     }
-    ProductSkuDO productSkuDO = new ProductSkuDO(param);
+    ProductDO productSkuDO = new ProductDO(param);
     int status = productDao.updateProductSku(productSkuDO);
     if (status <= 0) {
       return ResultBody.error(ResultEnum.FAILED_TO_EDIT_DATA);
@@ -82,14 +82,14 @@ public class ProductServiceImpl implements ProductSkuService {
     }
     Integer pageNo = productSkuQO.getPageNo();
     productSkuQO.buildCurrentPage();
-    List<ProductSkuDO> productSkuList = productDao.listPageProductSku(productSkuQO);
+    List<ProductDO> productSkuList = productDao.listPageProductSku(productSkuQO);
     List<Integer> productSkuIds =
-        productSkuList.stream().map(ProductSkuDO::getId).collect(Collectors.toList());
+        productSkuList.stream().map(ProductDO::getId).collect(Collectors.toList());
     List<ProductSpecDO> productSpecList = productDao.getProductSpecList(productSkuIds);
     Map<Integer, List<ProductSpecDO>> productSpecMap =
-        productSpecList.stream().collect(Collectors.groupingBy(ProductSpecDO::getProductSkuId));
+        productSpecList.stream().collect(Collectors.groupingBy(ProductSpecDO::getProductId));
     List<ProductSkuDTO> list =
-        productSkuList.stream().map(ProductSkuDO::buildProductSkuDTO).collect(Collectors.toList());
+        productSkuList.stream().map(ProductDO::buildProductSkuDTO).collect(Collectors.toList());
     list.stream()
         .peek(
             d -> {

src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.auth.dto.UserAccountSimpleDTO;
 import com.mmc.pms.common.ResultBody;

src/main/java/com/mmc/pms/service/Impl/WebProductMallServiceImpl.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.service.impl;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.dao.WebProductMallDao;
@@ -8,7 +8,6 @@ import com.mmc.pms.entity.ProductCategory;
 import com.mmc.pms.model.other.dto.AdDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
-import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebProductMallService;

src/main/java/com/mmc/pms/service/impl/BrandManageServiceImpl.java

-package com.mmc.pms.service.impl;
-
-import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.common.ResultEnum;
-import com.mmc.pms.dao.BrandManageDao;
-import com.mmc.pms.dao.ProductDao;
-import com.mmc.pms.entity.BrandInfoDO;
-import com.mmc.pms.model.sale.dto.BrandInfoDTO;
-import com.mmc.pms.page.PageResult;
-import com.mmc.pms.service.BrandManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author LW
- *
- * @date 2023/3/14 13:27 概要：
- */
-@Service
-public class BrandManageServiceImpl implements BrandManageService {
-
-  @Autowired private BrandManageDao brandManageDao;
-  @Resource private ProductDao productDao;
-
-  /**
-   * 添加品牌信息
-   *
-   * @param brandName 品牌名称
-   * @return {@link ResultBody}
-   */
-  @Override
-  public ResultBody addBrandInfo(String brandName) {
-    // 根据品牌名称判断是否存在
-    int count = brandManageDao.countBrandInfoByName(null, brandName);
-    if (count > 0) {
-      return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
-    }
-    BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
-    brandManageDao.insertBrandInfo(brandInfoDO);
-    return ResultBody.success();
-  }
-
-  /**
-   * 品牌列表信息
-   *
-   * @return {@link ResultBody}
-   */
-  @Override
-  public PageResult listBrandInfo(Integer pageNo, Integer pageSize) {
-    int count = brandManageDao.countBrandInfo();
-    if (count == 0) {
-      return PageResult.buildPage(pageNo, pageSize, 0);
-    }
-    int itemIndex = (pageNo - 1) * pageSize;
-    List<BrandInfoDO> brandInfo = brandManageDao.listBrandInfo(itemIndex, pageSize);
-    List<BrandInfoDTO> brandInfoList =
-        brandInfo.stream().map(BrandInfoDO::buildBrandInfoDTO).collect(Collectors.toList());
-    return PageResult.buildPage(pageNo, pageSize, count, brandInfoList);
-  }
-
-  /**
-   * 删除品牌信息
-   *
-   * @param id id
-   * @return {@link ResultBody}
-   */
-  @Override
-  public ResultBody deleteBrandInfo(Integer id) {
-    // 判断该品牌是否绑定产品信息
-    int count = productDao.countProductSpecByBrandId(id);
-    if (count > 0) {
-      return ResultBody.error(ResultEnum.BRAND_DELETE_FAIL);
-    }
-    brandManageDao.removeBrandInfoById(id);
-    return ResultBody.success();
-  }
-
-  @Override
-  public ResultBody editBrandInfo(Integer id, String brandName) {
-    // 根据品牌名称判断是否存在
-    int count = brandManageDao.countBrandInfoByName(id, brandName);
-    if (count > 0) {
-      return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
-    }
-    BrandInfoDO brandInfoDO = new BrandInfoDO(brandName);
-    brandInfoDO.setId(id);
-    brandManageDao.updateBrandInfo(brandInfoDO);
-    return ResultBody.success();
-  }
-}

src/main/java/com/mmc/pms/service/impl/InspComtServiceImpl.java

-package com.mmc.pms.service.impl;
-
-import com.mmc.pms.dao.InspComtDao;
-import com.mmc.pms.entity.InspComtDO;
-import com.mmc.pms.service.InspComtService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 评论表 服务实现类
- *
- * @author Pika
- * @since 2023-06-09
- */
-@Service
-public class InspComtServiceImpl implements InspComtService {
-
-  @Autowired private InspComtDao inspComtDao;
-
-  @Override
-  public List<InspComtDO> randomGetInspComtList(Integer size) {
-    return inspComtDao.randomGetInspComtList(size);
-  }
-}

src/main/java/com/mmc/pms/service/impl/WebProductMallServiceImpl.java

-package com.mmc.pms.service.impl;
-
-import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.dao.WebProductMallDao;
-import com.mmc.pms.entity.AdDO;
-import com.mmc.pms.entity.GoodsInfoDO;
-import com.mmc.pms.entity.ProductCategory;
-import com.mmc.pms.model.other.dto.AdDTO;
-import com.mmc.pms.model.qo.GoodsInfoQO;
-import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
-import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
-import com.mmc.pms.page.PageResult;
-import com.mmc.pms.service.WebProductMallService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author small @Date 2023/5/15 20:08 @Version 1.0
- */
-@Service
-public class WebProductMallServiceImpl implements WebProductMallService {
-
-  @Autowired private WebProductMallDao webProductMallDao;
-
-  @Override
-  public ResultBody productCategory() {
-    List<ProductCategory> category = webProductMallDao.productCategory();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody productParts() {
-    List<ProductCategory> category = webProductMallDao.productParts();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody productQuality() {
-    List<ProductCategory> category = webProductMallDao.productQuality();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody<AdDTO> ad() {
-    List<AdDO> ad = webProductMallDao.ad();
-    List<AdDTO> collect =
-        ad.stream()
-            .map(
-                t -> {
-                  return t.adDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public PageResult listPageGoodsInfo(GoodsInfoQO param) {
-    int count = webProductMallDao.countListGoodsInfo(param);
-    if (count == 0) {
-      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
-    }
-    Integer pageNo = param.getPageNo();
-    param.buildCurrentPage();
-    List<GoodsInfoDO> goodsInfo = webProductMallDao.listGoodsInfo(param);
-    goodsInfo.stream()
-        .forEach(
-            t -> {
-              Integer product = webProductMallDao.findProduct(t.getId());
-              t.setIsCoupons(product);
-            });
-    List<GoodsInfoListDTO> pageList =
-        goodsInfo.stream().map(GoodsInfoDO::buildGoodsInfoListDTO).collect(Collectors.toList());
-    return PageResult.buildPage(pageNo, param.getPageSize(), count, pageList);
-  }
-}