From 2dff7f26adc08af4fcf0b77ff0ddda99d75c77c4 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 18 十一月 2022 15:21:25 +0800 Subject: [PATCH] #feat 修改库存 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 69 +++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java index 4a5be8f..beb2596 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java @@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,9 +14,9 @@ import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.shop.*; import com.panzhihua.common.utlis.DifferentLongListUtil; -import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO; -import com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO; -import com.panzhihua.service_community.dao.ConvenientMerchantDAO; +import com.panzhihua.common.utlis.Snowflake; +import com.panzhihua.common.utlis.StringUtils; +import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService; import com.panzhihua.service_community.service.ComShopFlowerGoodsService; @@ -27,6 +28,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + +import static java.util.Objects.nonNull; /** * @ClassName: ComShopFlowerGoodsServiceImpl @@ -44,24 +47,27 @@ private ComShopFlowerGoodsAttrDAO shopFlowerGoodsAttrDAO; @Resource private ConvenientMerchantDAO convenientMerchantDAO; + @Resource + private ConvenientGoodsCategoryDAO convenientGoodsCategoryDAO; + @Resource + private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO; + @Resource + private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO; @Override public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) { if (addShopFlowerGoodsVO == null) { return R.ok("500", "数据为空!"); } - String[] images = addShopFlowerGoodsVO.getGoodsPic().split(","); + ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO(); BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO); shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice()); - if (images.length > 1) { - shopGoodsDO.setGoodsPic(images[0]); - } - shopGoodsDO.setImages(addShopFlowerGoodsVO.getGoodsPic()); shopGoodsDO.setSale(0); - shopGoodsDO.setDetails(addShopFlowerGoodsVO.getDetails()); int goodsId = this.baseMapper.insert(shopGoodsDO); if (goodsId > 0) { + + //保存规格 ArrayList<ComShopFlowerGoodsAttrDO> goodsAttrDOS = Lists.newArrayList(); ComShopFlowerGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId()); addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> { @@ -86,7 +92,21 @@ if (goodsAttrDOS.size() > 0) { comShopFlowerGoodsAttrService.saveBatch(goodsAttrDOS); } + + //保存商品分类 + Long goodId = shopGoodsDO.getId(); + if (nonNull(goodId)) { + //添加分类 + List<Long> categoryIds = addShopFlowerGoodsVO.getCategoryIds(); + categoryIds.forEach(categoryId -> { + ConvenientGoodsCategoryDO convenientGoodsCategoryDO = convenientGoodsCategoryDAO.selectById(categoryId); + convenientGoodsCategoryDAO.createGoodsCategoryRelation(Snowflake.getId(),goodId, categoryId, + convenientGoodsCategoryDO.getName(), convenientGoodsCategoryDO.getCreatedBy()); + }); + } } + + return R.ok(); } @@ -111,9 +131,13 @@ for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) { AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO(); BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO); + goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId()); goodsAttrVOList.add(goodsAttrVO); } shopGoods.setGoodsAttrs(goodsAttrVOList); + if (CollUtil.isNotEmpty(goodsAttrDOs)){ + shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic()); + } }); } return R.ok(comShopStoreVOIPage); @@ -132,15 +156,16 @@ IPage<ComShopFlowerGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopFlowerGoodsDTO); if (!goodsVOIPage.getRecords().isEmpty()) { goodsVOIPage.getRecords().forEach(goodsVo -> { - List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsVo.getId()); + Long goodsId = goodsVo.getId(); + List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsId); if (!goodsAttrList.isEmpty()) { ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0); - goodsVo.setGoodsAttrList(goodsAttrList); goodsVo.setGoodsPic(comShopFlowerGoodsAttrVO.getAttrPic()); goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice()); goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice()); } + }); } return R.ok(goodsVOIPage); @@ -161,11 +186,15 @@ List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>(); List<ComShopFlowerGoodsAttrDO> goodsAttrDOS = shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().eq("goods_id", goodsId)); + List<String> images = new ArrayList<>(); goodsAttrDOS.forEach(attrDO -> { ComShopFlowerGoodsAttrVO goodsAttrVO = new ComShopFlowerGoodsAttrVO(); BeanUtils.copyProperties(attrDO, goodsAttrVO); + String attrPic = attrDO.getAttrPic(); + images.add(attrPic); goodsAttrList.add(goodsAttrVO); }); + // 查询商品店铺信息 ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(goodsDO.getStoreId()); @@ -177,6 +206,11 @@ BeanUtils.copyProperties(goodsDO, shopGoods); shopGoods.setGoodsAttrList(goodsAttrList); shopGoods.setConvenientMerchantVO(convenientMerchantVO); + shopGoods.setImages(StringUtils.join(images,",")); + Integer orderNum = comShopFlowerOrderGoodsDAO.selectCount(new LambdaQueryWrapper<ComShopFlowerOrderGoodsDO>().eq(ComShopFlowerOrderGoodsDO::getGoodsId, goodsId)); + shopGoods.setOrderNum(orderNum); + List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId); + shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList); return R.ok(shopGoods); } @@ -231,7 +265,7 @@ shopFlowerGoodsAttrDAO.updateById(comShopGoodsAttrDO); } else { comShopGoodsAttrDO = new ComShopFlowerGoodsAttrDO(); - comShopGoodsAttrDO.setGoodsId(shopGoodsDO.getId()); + comShopGoodsAttrDO.setGoodsId(id); comShopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId()); comShopGoodsAttrDO.setGoodsName(shopGoodsDO.getName()); comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName()); @@ -250,13 +284,10 @@ } @Override - public R deleteShopFlowerGoods(Long[] id) { - LambdaQueryWrapper<ComShopFlowerGoodsDO> query = new LambdaQueryWrapper<ComShopFlowerGoodsDO>().in(ComShopFlowerGoodsDO::getId, id); - List<ComShopFlowerGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query); - for (ComShopFlowerGoodsDO one : comShopGoodsDOS) { - one.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes); - this.baseMapper.updateById(one); - } + public R deleteShopFlowerGoods(Long id) { + ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(id); + comShopFlowerGoodsDO.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes); + this.baseMapper.updateById(comShopFlowerGoodsDO); return R.ok(); } -- Gitblit v1.7.1