From 2be17adffb5e055ed563ba73c928a5842c45a81e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:04:37 +0800
Subject: [PATCH] 属性对比
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 9 +++++++--
1 files changed, 7 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 cea3ada..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
@@ -153,7 +153,7 @@
BaseGoods model = new BaseGoods();
model.setId(id);
model.setEditDate(new Date());
- model.setIsdeleted(Constants.ZERO);
+ model.setIsdeleted(Constants.ONE);
updateById(model);
// baseGoodsMapper.deleteById(id);
}
@@ -391,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)
@@ -399,13 +400,15 @@
.eq(pageWrap.getModel().getCategoryId()!=null,BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId())
.eq(pageWrap.getModel().getBrandId()!=null,BaseGoods::getBrandId, pageWrap.getModel().getBrandId())
.eq(pageWrap.getModel().getStatus()!=null,BaseGoods::getStatus, pageWrap.getModel().getStatus())
- .notExists(user.getType().equals(Constants.UserType.COMPANY.getKey())," select 1 from goods g where g.GOODS_ID = t.id and g.TYPE = 1 and g.company_id = "+user.getCompanyId()+" ");
+ .notExists(user.getType().equals(Constants.UserType.COMPANY.getKey())," select 1 from goods g where g.GOODS_ID = t.id and g.TYPE = 1 and g.ISDELETED = 0 and g.company_id = "+user.getCompanyId()+" ");
queryWrapper.orderByDesc(Goods::getId);
PageData<BaseGoods> pageData =PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
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());
+ //鍔犱环绯绘暟
+ i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice())));
});
return pageData;
}
@@ -516,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