From daccfb7928e41005e8e31073100442e1e423ea5c Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 25 十二月 2023 15:20:01 +0800
Subject: [PATCH] 商品导入修改
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 3546e9e..8200bae 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -294,7 +294,9 @@
private void dealPlatMultifule(Integer id, LoginUserInfo user, BaseGoods model,List<Multifile> fileList ) {
Multifile f = new Multifile();
f.setObjId(model.getId());
+ f.setObjType(Constants.ONE);
f.setIsdeleted(Constants.ZERO);
+ f.setObjType(Constants.ONE);
List<Multifile> multifileList =multifileMapper.selectList(new QueryWrapper<>(f));
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
@@ -359,6 +361,9 @@
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
Multifile multifile = multifileList.get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
multifile.setCreator(user.getId());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
@@ -619,7 +624,7 @@
if(!Objects.isNull(category)){
goods.setCategoryName(category.getName());
}
- goods.setMultifileList(multifileMapper.selectList(new QueryWrapper<Multifile>().eq("OBJ_ID",id)));
+ goods.setMultifileList(multifileMapper.selectList(new QueryWrapper<Multifile>().eq("OBJ_TYPE",Constants.ZERO).eq("OBJ_ID",id)));
return goods;
}
@@ -652,7 +657,9 @@
Goods::getPrice,goods.getSPrice(),goods.getEPrice());
queryWrapper.orderByDesc(Goods::getId);
List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
- this.dealGoodsMsg(goodsList);
+ if(!Objects.isNull(goodsList)&&goodsList.size()>Constants.ZERO){
+ this.dealGoodsMsg(goodsList);
+ }
return goodsList;
}
@@ -703,7 +710,9 @@
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
- i.setBasePrice(Constants.formatBigdecimal(i.getBasePrice()).multiply(Constants.formatBigdecimal(i.getBasePriceRate())));
+ if(i.getType().equals(Constants.ONE)){
+ i.setBasePrice(Constants.formatBigdecimal(i.getBasePrice()).multiply(Constants.formatBigdecimal(i.getBasePriceRate())).setScale(0,BigDecimal.ROUND_CEILING));
+ }
});
return PageData.from(goodsIPage);
}
@@ -784,8 +793,8 @@
if(brand == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍝佺墝鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
}
- if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("ISDELETED",Constants.ZERO).eq("name",m.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(num)+"銆戣銆�"+m.getName()+"銆戝凡瀛樺湪");
+ if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("COMPANY_ID",user.getCompanyId()).eq("ISDELETED",Constants.ZERO).eq("name",m.getName()))>0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(num)+"銆戣銆�"+m.getName()+"銆戝凡瀛樺湪");
}
Goods newModel = new Goods();
newModel.setRemark(m.getId());
@@ -1110,7 +1119,10 @@
List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
- .in("OBJ_ID",integerList).eq("TYPE",Constants.ZERO));
+ .lambda().in(Multifile::getObjId,integerList)
+ .eq(Multifile::getType,Constants.ZERO)
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.ZERO));
List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
.in("GOODS_ID",integerList)
.orderByAsc(" SORTNUM "));
@@ -1153,7 +1165,9 @@
.apply(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getEPrice()), " t.PRICE <= "+goodsRequest.getEPrice()+" ");
queryWrapper.orderByDesc(Goods::getId);
List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
- this.dealGoodsMsg(goodsList);
+ if(!Objects.isNull(goodsList)&&goodsList.size()>Constants.ZERO){
+ this.dealGoodsMsg(goodsList);
+ }
return goodsList;
}
--
Gitblit v1.9.3