From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 30 四月 2025 16:45:34 +0800 Subject: [PATCH] sf --- server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java index ab87999..e45e5e6 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java @@ -85,7 +85,7 @@ // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪"); // } - Integer integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO)); + Long integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO)); BaseGoods insert = new BaseGoods(); insert.setCreator(user.getId()); insert.setCreateDate(new Date()); @@ -359,8 +359,11 @@ Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId) .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId) +// .leftJoin(BaseData.class,BaseData::getId,BaseGoods::getBaseDataId) .selectAll(BaseGoods.class) + .selectAs(BaseCategory::getPriceRate,BaseGoods::getCateRatePrice) .selectAs(Brand::getName,BaseGoods::getBrandName) +// .selectAs(BaseData::getPrice,BaseGoods::getJdPrice) .selectAs(BaseCategory::getName,BaseGoods::getCategoryName) .eq(BaseGoods::getIsdeleted, Constants.ZERO) .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName()) @@ -374,7 +377,11 @@ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode(); pageData.getRecords().forEach(i->{ - i.setFullImgUrl(prefixUrl + i.getImgurl()); + if(StringUtils.isNotBlank(i.getImgurl())){ + i.setFullImgUrl(prefixUrl + i.getImgurl()); + } + i.setJdPrice(i.getPrice()); + i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice()))); }); return pageData; } @@ -391,6 +398,7 @@ .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId) .selectAll(BaseGoods.class) .selectAs(Brand::getName,BaseGoods::getBrandName) + .selectAs(BaseCategory::getPriceRate,BaseGoods::getCateRatePrice) .selectAs(BaseCategory::getName,BaseGoods::getCategoryName) .eq(BaseGoods::getStatus, Constants.ZERO) .eq(BaseGoods::getIsdeleted, Constants.ZERO) @@ -406,6 +414,8 @@ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode(); pageData.getRecords().forEach(i->{ i.setFullImgUrl(prefixUrl + i.getImgurl()); + //鍔犱环绯绘暟 + i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice()))); }); return pageData; } -- Gitblit v1.9.3