Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 e32ef61f9bcbc5d542d19e56f6c96f18bd02c6e9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.collection.CollUtil;
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;
@@ -221,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);
@@ -257,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());