Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java

@@ -1,38 +1,35 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.utlis.DifferentLongListUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
import com.panzhihua.service_community.dao.ComShopGoodsDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DifferentLongListUtil;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopGoodsDAO;
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopGoodsService;

import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -41,7 +38,8 @@
 */
@Slf4j
@Service
public class ComShopGoodsServiceImpl extends ServiceImpl<ComShopGoodsDAO, ComShopGoodsDO> implements ComShopGoodsService {
public class ComShopGoodsServiceImpl extends ServiceImpl<ComShopGoodsDAO, ComShopGoodsDO>
    implements ComShopGoodsService {
    @Resource
    private ComShopGoodsAttrServiceImpl goodsAttrService;
    @Resource
@@ -68,7 +66,7 @@
        if (goodsId > 0) {
            ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
            ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
            addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {//维护商品规格表
            addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {// 维护商品规格表
                if (goodDO == null) {
                    throw new ServiceException("商家id不存在！");
                }
@@ -82,7 +80,7 @@
                shopGoodsAttrDO.setAttrPic(images[0]);
                goodsAttrDOS.add(shopGoodsAttrDO);
            });
            if (addShopGoodsVO.getGoodsAttrVOList().size() < 1) {//如果没有规格参数加默认
            if (addShopGoodsVO.getGoodsAttrVOList().size() < 1) {// 如果没有规格参数加默认
                ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
                shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
                shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
@@ -102,13 +100,15 @@

    @Override
    public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) {
        long pageNum = pageComShopGoodsDTO.getPageNum()!=null?pageComShopGoodsDTO.getPageNum():1;
        long pageSize = pageComShopGoodsDTO.getPageSize()!=null?pageComShopGoodsDTO.getPageSize():10;
        long pageNum = pageComShopGoodsDTO.getPageNum() != null ? pageComShopGoodsDTO.getPageNum() : 1;
        long pageSize = pageComShopGoodsDTO.getPageSize() != null ? pageComShopGoodsDTO.getPageSize() : 10;
        Page page = new Page<>(pageNum, pageSize);
        IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
        if (!comShopStoreVOIPage.getRecords().isEmpty()) {
            comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
                List<ComShopGoodsAttrDO> goodsAttrDOs = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda().eq(ComShopGoodsAttrDO::getGoodsId, shopGoods.getId()));
                List<ComShopGoodsAttrDO> goodsAttrDOs =
                    shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().lambda()
                        .eq(ComShopGoodsAttrDO::getGoodsId, shopGoods.getId()));
                ArrayList<AddShopGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
                for (ComShopGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
                    AddShopGoodsAttrVO goodsAttrVO = new AddShopGoodsAttrVO();
@@ -128,7 +128,8 @@
        if (addShopGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        LambdaQueryWrapper<ComShopGoodsDO> query =
            new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
        BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopGoodsVO.getPrice());
@@ -136,10 +137,12 @@
        if (update < 1) {
            throw new ServiceException("修改失败");
        }
        //修改规格表
        List<ComShopGoodsAttrDO> comShopGoodsAttrDOS = shopGoodsAttrDAO.selectList(new LambdaQueryWrapper<ComShopGoodsAttrDO>().eq(ComShopGoodsAttrDO::getGoodsId, id));
        // 修改规格表
        List<ComShopGoodsAttrDO> comShopGoodsAttrDOS = shopGoodsAttrDAO
            .selectList(new LambdaQueryWrapper<ComShopGoodsAttrDO>().eq(ComShopGoodsAttrDO::getGoodsId, id));
        if (addShopGoodsVO.getGoodsAttrVOList().size() == 0) {
            shopGoodsAttrDAO.delete(new LambdaQueryWrapper<ComShopGoodsAttrDO>().eq(ComShopGoodsAttrDO::getGoodsId, id));
            shopGoodsAttrDAO
                .delete(new LambdaQueryWrapper<ComShopGoodsAttrDO>().eq(ComShopGoodsAttrDO::getGoodsId, id));
            ComShopGoodsAttrDO comShopGoodsAttrDO = new ComShopGoodsAttrDO();
            comShopGoodsAttrDO.setGoodsId(id);
            comShopGoodsAttrDO.setStoreId(addShopGoodsVO.getStoreId());
@@ -149,21 +152,23 @@
            comShopGoodsAttrDO.setIsDefault(1);
            comShopGoodsAttrDO.setPrice(addShopGoodsVO.getPrice());
            shopGoodsAttrDAO.insert(comShopGoodsAttrDO);
        }else{
            List<Long> attrIds = comShopGoodsAttrDOS.stream().map(ComShopGoodsAttrDO::getId).collect(Collectors.toList());
            List<Long> voAttrIds = addShopGoodsVO.getGoodsAttrVOList().stream().map(AddShopGoodsAttrVO::getGoodsAttrId).collect(Collectors.toList());
            //需要删除的规格ID——针对编辑时删除了规格的情况
        } else {
            List<Long> attrIds =
                comShopGoodsAttrDOS.stream().map(ComShopGoodsAttrDO::getId).collect(Collectors.toList());
            List<Long> voAttrIds = addShopGoodsVO.getGoodsAttrVOList().stream().map(AddShopGoodsAttrVO::getGoodsAttrId)
                .collect(Collectors.toList());
            // 需要删除的规格ID——针对编辑时删除了规格的情况
            List<Long> deleteIds = DifferentLongListUtil.getDiffrent(attrIds, voAttrIds);
            if(deleteIds.size()!=0){
            if (deleteIds.size() != 0) {
                shopGoodsAttrDAO.deleteBatchIds(deleteIds);
            }
            addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                ComShopGoodsAttrDO comShopGoodsAttrDO = shopGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
                if(comShopGoodsAttrDO!=null){
                if (comShopGoodsAttrDO != null) {
                    comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
                    comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
                    shopGoodsAttrDAO.updateById(comShopGoodsAttrDO);
                }else{
                } else {
                    comShopGoodsAttrDO = new ComShopGoodsAttrDO();
                    comShopGoodsAttrDO.setGoodsId(id);
                    comShopGoodsAttrDO.setStoreId(addShopGoodsVO.getStoreId());
@@ -181,7 +186,8 @@

    @Override
    public R deleteShopGoods(Long[] id) {
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().in(ComShopGoodsDO::getId, id);
        LambdaQueryWrapper<ComShopGoodsDO> query =
            new LambdaQueryWrapper<ComShopGoodsDO>().in(ComShopGoodsDO::getId, id);
        List<ComShopGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query);
        for (ComShopGoodsDO one : comShopGoodsDOS) {
            one.setDeleteStatus(2);
@@ -204,7 +210,8 @@
    /**
     * 分页查询商品列表
     *
     * @param comShopGoodsDTO 请求参数
     * @param comShopGoodsDTO
     *            请求参数
     * @return 商品列表
     */
    @Override
@@ -225,13 +232,14 @@
    /**
     * 根据商品id查询商品信息
     *
     * @param goodsId 商品id
     * @param goodsId
     *            商品id
     * @return 商品信息
     */
    @Override
    public R shopGoodsDetail(Long goodsId) {

        //根据id查询商品信息
        // 根据id查询商品信息
        ComShopGoodsDO goodsDO = this.baseMapper.selectById(goodsId);
        if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopGoodsDO.deleteStatus.yes)) {
            return R.fail(403, "商品不存在");
@@ -240,21 +248,22 @@
            return R.fail(405, "商品已下架");
        }

        //根据商品id查询商品规格信息
        // 根据商品id查询商品规格信息
        List<ComShopGoodsAttrVO> goodsAttrList = new ArrayList<>();
        List<ComShopGoodsAttrDO> goodsAttrDOS = shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().eq("goods_id", goodsId));
        List<ComShopGoodsAttrDO> goodsAttrDOS =
            shopGoodsAttrDAO.selectList(new QueryWrapper<ComShopGoodsAttrDO>().eq("goods_id", goodsId));
        goodsAttrDOS.forEach(attrDO -> {
            ComShopGoodsAttrVO goodsAttrVO = new ComShopGoodsAttrVO();
            BeanUtils.copyProperties(attrDO, goodsAttrVO);
            goodsAttrList.add(goodsAttrVO);
        });

        //查询商品店铺信息
        // 查询商品店铺信息
        ComShopStoreDO shopStoreDO = shopStoreDAO.selectById(goodsDO.getStoreId());
        PageShopStoreVO shopStoreVO = new PageShopStoreVO();
        BeanUtils.copyProperties(shopStoreDO, shopStoreVO);

        //设置值
        // 设置值
        ComShopGoodsVO shopGoods = new ComShopGoodsVO();
        BeanUtils.copyProperties(goodsDO, shopGoods);
        shopGoods.setGoodsAttrList(goodsAttrList);