bug修复

huanghongfa

2021-04-20 2d6895f99ce9d5fff6c1c6b353e61dc7938418a5

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

@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.shop.AddShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
@@ -81,7 +82,11 @@
                shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
                shopGoodsAttrDO.setGoodsName(goodDO.getName());
                //如果没有规格加默认
                shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
                if(StringUtils.isNotEmpty(goodsAttr.getGoodsAttr())){
                    shopGoodsAttrDO.setGoodsAttr("默认");
                }else{
                    shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
                }
                shopGoodsAttrDO.setIsDefault(1);
                shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
                goodsAttrDOS.add(shopGoodsAttrDO);
@@ -136,15 +141,16 @@
            }
            //先删除
            ComShopGoodsAttrDO goodsAttrDO = goodsAttrService.getBaseMapper().selectById(goodsAttr.getGoodsAttrId());
            if (goodsAttrDO == null) {
                throw new ServiceException("规格为空,请检查规格Id");
            }
            ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
            shopGoodsAttrDO.setGoodsId(id);
            shopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
            shopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
            //如果没有规格加默认
            shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
            if (goodsAttrDO == null) {
                //如果没有规格加默认
                shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
            }else{
                shopGoodsAttrDO.setGoodsAttr("默认");
            }
            shopGoodsAttrDO.setIsDefault(1);
            shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
            goodsAttrDOS.add(shopGoodsAttrDO);
@@ -187,9 +193,18 @@
     * @return 商品列表
     */
    @Override
    public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO) {
        Page page = new Page<>(comShopGoodsDTO.getPageNum(), comShopGoodsDTO.getPageSize());
        return R.ok(this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO));
    public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO){
        Page page = new Page<>(comShopGoodsDTO.getPageNum(),comShopGoodsDTO.getPageSize());
        IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page,comShopGoodsDTO);
        if(!goodsVOIPage.getRecords().isEmpty()){
            goodsVOIPage.getRecords().forEach(goodsVo -> {
                List<ComShopGoodsAttrVO> goodsAttrList = shopGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
                if(!goodsAttrList.isEmpty()){
                    goodsVo.setGoodsAttrList(goodsAttrList);
                }
            });
        }
        return R.ok(goodsVOIPage);
    }

    /**