From b9324c7df56b7a9767b0c0dbd7ebaef628b8aeae Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 05 六月 2023 18:18:45 +0800
Subject: [PATCH] 修改居家养老报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 ef8e309..79f80b0 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
@@ -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;
@@ -139,16 +137,26 @@
shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
.eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
+ StringBuilder sbr = new StringBuilder();
+ int stock = 0;
for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
- goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
+ goodsAttrVO.setId(oneGoodsAttrDO.getId());
goodsAttrVOList.add(goodsAttrVO);
+ stock = stock +oneGoodsAttrDO.getStock();
+ sbr.append(oneGoodsAttrDO.getGoodsAttrName()).append(" ");
}
+ shopGoods.setGoodsAttrName(sbr.toString());
shopGoods.setGoodsAttrs(goodsAttrVOList);
if (CollUtil.isNotEmpty(goodsAttrDOs)){
shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic());
}
+ //设置商品总浏览量
+ shopGoods.setViewNum(comShopFlowerGoodsViewStatisticsDAO.selectTotalViewNum(shopGoods.getId()));
+ String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
+ shopGoods.setCategoryName(categoryNames);
+ shopGoods.setStock(stock);
});
}
return R.ok(comShopStoreVOIPage);
@@ -191,9 +199,9 @@
if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
return R.fail(403, "商品不存在");
}
- if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
- return R.fail(405, "商品已下架");
- }
+// if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
+// return R.fail(405, "商品已下架");
+// }
// 根据商品id查询商品规格信息
List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();
@@ -273,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);
@@ -281,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());
--
Gitblit v1.7.1