java/zhihuishenqu.git

			@@ -2,7 +2,6 @@

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.util.NumberUtil;
			import cn.hutool.core.util.StrUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			@@ -17,7 +16,6 @@
			import com.panzhihua.common.model.vos.shop.*;
			import com.panzhihua.common.utlis.DifferentLongListUtil;
			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;
			@@ -141,13 +139,11 @@
			ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
			StringBuilder sbr = new StringBuilder();
			int stock = 0;
			int sale = 0;
			for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
			AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
			BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
			goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
			goodsAttrVO.setId(oneGoodsAttrDO.getId());
			goodsAttrVOList.add(goodsAttrVO);
			sale = sale + oneGoodsAttrDO.getSale();
			stock = stock +oneGoodsAttrDO.getStock();
			sbr.append(oneGoodsAttrDO.getGoodsAttrName()).append(" ");
			}
			@@ -161,7 +157,6 @@
			String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
			shopGoods.setCategoryName(categoryNames);
			shopGoods.setStock(stock);
			shopGoods.setSale(sale);
			});
			}
			return R.ok(comShopStoreVOIPage);
			@@ -286,7 +281,7 @@
			} else {
			List<Long> attrIds =
			comShopFlowerGoodsAttrDOS.stream().map(ComShopFlowerGoodsAttrDO::getId).collect(Collectors.toList());
			List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getGoodsAttrId)
			List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getId)
			.collect(Collectors.toList());
			// 需要删除的规格ID——针对编辑时删除了规格的情况
			List<Long> deleteIds = DifferentLongListUtil.getDiffrent(attrIds, voAttrIds);
			@@ -294,7 +289,7 @@
			shopFlowerGoodsAttrDAO.deleteBatchIds(deleteIds);
			}
			addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
			ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
			ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getId());
			if (comShopGoodsAttrDO != null) {
			comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
			comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());