From e32ef61f9bcbc5d542d19e56f6c96f18bd02c6e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 16:56:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 c4c4532..64283ae 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
@@ -222,6 +222,8 @@
shopGoods.setOrderNum(orderNum);
List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId);
shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList);
+ Integer evaluateNum = comShopFlowerEvaluateDAO.selectCountByGoodsId(goodsId);
+ shopGoods.setEvaluateNum(evaluateNum);
List<Long> categoryIds = convenientGoodsCategoryDAO.selectCategoryIdsForGoods(goodsId);
shopGoods.setCategoryIds(categoryIds);
@@ -246,9 +248,6 @@
ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
- if (StrUtil.isEmpty(addShopFlowerGoodsVO.getImages())){
- shopGoodsDO.setImages("");
- }
int update = this.baseMapper.update(shopGoodsDO, query);
if (update < 1) {
throw new ServiceException("修改失败");
@@ -261,7 +260,7 @@
.delete(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
ComShopFlowerGoodsAttrDO comShopFlowerGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
comShopFlowerGoodsAttrDO.setGoodsId(id);
- comShopFlowerGoodsAttrDO.setStoreId(addShopFlowerGoodsVO.getStoreId());
+ comShopFlowerGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
comShopFlowerGoodsAttrDO.setGoodsName(addShopFlowerGoodsVO.getName());
comShopFlowerGoodsAttrDO.setGoodsAttrName("默认");
comShopFlowerGoodsAttrDO.setAttrPic(addShopFlowerGoodsVO.getGoodsPic());
--
Gitblit v1.7.1