From 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 九月 2023 11:59:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev --- server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 17 +++++++++++++++-- 1 files changed, 15 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 7dff32c..7c30b43 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 @@ -150,7 +150,12 @@ @Override public void deleteById(Integer id) { - baseGoodsMapper.deleteById(id); + BaseGoods model = new BaseGoods(); + model.setId(id); + model.setEditDate(new Date()); + model.setIsdeleted(Constants.ONE); + updateById(model); +// baseGoodsMapper.deleteById(id); } @Override @@ -164,7 +169,10 @@ if (CollectionUtils.isEmpty(ids)) { return; } - baseGoodsMapper.deleteBatchIds(ids); + for(Integer id : ids){ + deleteById(id); + } +// baseGoodsMapper.deleteBatchIds(ids); } @@ -383,6 +391,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) @@ -398,6 +407,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; } @@ -508,6 +519,8 @@ // baseGoods.setImgurl(); baseGoods.setCategoryId(baseCategory.getId()); baseGoods.setBrandId(brand.getId()); + baseGoods.setPinyin(PinYinUtil.getFullSpell(s.getName())); + baseGoods.setShortPinyin(PinYinUtil.getFirstSpell(s.getName())); baseGoodsMapper.insert(baseGoods); if(mulFiles !=null && mulFiles.size()>0){ -- Gitblit v1.9.3