Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 17870eeeca47c08244b244c0acb7fe3f3216621f

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

@@ -131,6 +131,7 @@
                for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
                    AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
                    BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
                    goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
                    goodsAttrVOList.add(goodsAttrVO);
                }
                shopGoods.setGoodsAttrs(goodsAttrVOList);
@@ -283,13 +284,10 @@
    }

    @Override
    public R deleteShopFlowerGoods(Long[] id) {
        LambdaQueryWrapper<ComShopFlowerGoodsDO> query = new LambdaQueryWrapper<ComShopFlowerGoodsDO>().in(ComShopFlowerGoodsDO::getId, id);
        List<ComShopFlowerGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query);
        for (ComShopFlowerGoodsDO one : comShopGoodsDOS) {
            one.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
            this.baseMapper.updateById(one);
        }
    public R deleteShopFlowerGoods(Long id) {
        ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(id);
        comShopFlowerGoodsDO.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
        this.baseMapper.updateById(comShopFlowerGoodsDO);
        return R.ok();
    }