From 970ed0f8df6a19e4e3dae062c4e2e2232a0b97d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 11:06:45 +0800
Subject: [PATCH] 删除商家bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 91 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
index 5d38b84..0b7e793 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -1,12 +1,9 @@
package com.panzhihua.service_community.service.impl;
-import java.math.BigDecimal;
-
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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
@@ -16,29 +13,20 @@
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.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.ComShopGoodsAttrDAO;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-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.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;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -64,15 +52,20 @@
if (addShopGoodsVO == null) {
return R.ok("500", "数据为空！");
}
+ String[] images = addShopGoodsVO.getGoodsPic().split(",");
ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO);
+ if (images.length > 1) {
+ shopGoodsDO.setGoodsPic(images[0]);
+ }
+ shopGoodsDO.setImages(addShopGoodsVO.getGoodsPic());
shopGoodsDO.setSale(0);
+ shopGoodsDO.setDetails(addShopGoodsVO.getDetails());
int goodsId = this.baseMapper.insert(shopGoodsDO);
if (goodsId > 0) {
ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
- addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
- ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
- //维护商品规格表
+ ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
+ addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {//维护商品规格表
if (goodDO == null) {
throw new ServiceException("商家id不存在！");
}
@@ -80,12 +73,23 @@
shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
shopGoodsAttrDO.setGoodsName(goodDO.getName());
- //如果没有规格加默认
shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
shopGoodsAttrDO.setIsDefault(1);
shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
+ shopGoodsAttrDO.setAttrPic(images[0]);
goodsAttrDOS.add(shopGoodsAttrDO);
});
+ if (addShopGoodsVO.getGoodsAttrVOList().size() < 1) {//如果没有规格参数加默认
+ ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
+ shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
+ shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
+ shopGoodsAttrDO.setGoodsName(goodDO.getName());
+ shopGoodsAttrDO.setGoodsAttr("默认");
+ shopGoodsAttrDO.setIsDefault(1);
+ shopGoodsAttrDO.setPrice(goodDO.getPrice());
+ shopGoodsAttrDO.setAttrPic(images[0]);
+ goodsAttrService.save(shopGoodsAttrDO);
+ }
if (goodsAttrDOS.size() > 0) {
goodsAttrService.saveBatch(goodsAttrDOS);
}
@@ -97,23 +101,20 @@
public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) {
Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
- List<PageShopGoodsVO> shopGoodsVOS = comShopStoreVOIPage.getRecords();
- List<Long> goodsIds = shopGoodsVOS.stream().map(PageShopGoodsVO::getId).collect(Collectors.toList());
- LambdaQueryWrapper<ComShopGoodsAttrDO> in = new LambdaQueryWrapper<ComShopGoodsAttrDO>().in(ComShopGoodsAttrDO::getGoodsId, goodsIds);
- //分页查询商品规格，组装数据
- List<ComShopGoodsAttrDO> goodsAttrDOS = goodsAttrService.getBaseMapper().selectList(in);
- comShopStoreVOIPage.getRecords().forEach(vo -> {
- List<ComShopGoodsAttrDO> goodsAttrDOs = goodsAttrDOS.stream().filter(goodsAttr -> goodsAttr.getGoodsId().equals(vo.getId())).collect(Collectors.toList());
- ArrayList<AddShopGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
- for (ComShopGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
- AddShopGoodsAttrVO goodsAttrVO = new AddShopGoodsAttrVO();
- goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
- goodsAttrVO.setGoodsAttr(oneGoodsAttrDO.getGoodsAttr());
- goodsAttrVO.setAttrPrice(oneGoodsAttrDO.getPrice());
- goodsAttrVOList.add(goodsAttrVO);
- }
- vo.setGoodsAttts(goodsAttrVOList);
- });
+ if (!comShopStoreVOIPage.getRecords().isEmpty()) {
+ comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
+ 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();
+ goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
+ goodsAttrVO.setGoodsAttr(oneGoodsAttrDO.getGoodsAttr());
+ goodsAttrVO.setAttrPrice(oneGoodsAttrDO.getPrice());
+ goodsAttrVOList.add(goodsAttrVO);
+ }
+ shopGoods.setGoodsAttts(goodsAttrVOList);
+ });
+ }
return R.ok(comShopStoreVOIPage);
}
@@ -136,15 +137,16 @@
}
//先删除
ComShopGoodsAttrDO goodsAttrDO = goodsAttrService.getBaseMapper().selectById(goodsAttr.getGoodsAttrId());
- if (goodsAttrDO == null) {
- throw new ServiceException("规格为空,请检查规格Id");
- }
ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
shopGoodsAttrDO.setGoodsId(id);
shopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
shopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
- //如果没有规格加默认
- shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ if (goodsAttrDO == null) {
+ //如果没有规格加默认
+ shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ } else {
+ shopGoodsAttrDO.setGoodsAttr("默认");
+ }
shopGoodsAttrDO.setIsDefault(1);
shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
goodsAttrDOS.add(shopGoodsAttrDO);
@@ -189,7 +191,16 @@
@Override
public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO) {
Page page = new Page<>(comShopGoodsDTO.getPageNum(), comShopGoodsDTO.getPageSize());
- return R.ok(this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO));
+ IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO);
+ if (!goodsVOIPage.getRecords().isEmpty()) {
+ goodsVOIPage.getRecords().forEach(goodsVo -> {
+ List<ComShopGoodsAttrVO> goodsAttrList = shopGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
+ if (!goodsAttrList.isEmpty()) {
+ goodsVo.setGoodsAttrList(goodsAttrList);
+ }
+ });
+ }
+ return R.ok(goodsVOIPage);
}
/**
--
Gitblit v1.7.1