Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-30 e63624787585ca104a24350e83ec1b92d697902a

 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.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -27,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -211,7 +213,8 @@
        ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(goodsDO.getStoreId());
        ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
        BeanUtils.copyProperties(convenientMerchantDO, convenientMerchantVO);

        BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(convenientMerchantDO.getId());
        convenientMerchantVO.setScore(null == score ? BigDecimal.ZERO : NumberUtil.round(score, 1));
        // 设置值
        ComShopFlowerGoodsVO shopGoods = new ComShopFlowerGoodsVO();
        BeanUtils.copyProperties(goodsDO, shopGoods);
@@ -222,6 +225,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 +251,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 +263,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());