From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 113 ++++++++++++++++++++++++--------------------------------
1 files changed, 48 insertions(+), 65 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 e5d6640..bb7ec36 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
@@ -207,9 +207,9 @@
.eq("ISDELETED",Constants.ZERO)
.eq("STATUS",Constants.ZERO)
.last(" limit 1 "));
- if(Objects.isNull(cateParam)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浼佷笟鍒嗙被鏁版嵁鍚屾寮傚父璇疯仈绯荤鐞嗗憳");
- }
+// if(Objects.isNull(cateParam)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浼佷笟鍒嗙被鏁版嵁鍚屾寮傚父璇疯仈绯荤鐞嗗憳");
+// }
GoodsParam goodsParam = new GoodsParam();
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
@@ -219,24 +219,8 @@
goodsParam.setGoodsId(goods.getId());
goodsParam.setVal(bgParam.getVal());
goodsParam.setName(bgParam.getName());
- goodsParam.setPramaId(cateParam.getId());
+ goodsParam.setPramaId(Objects.isNull(cateParam)?null:cateParam.getId());
goodsParamMapper.insert(goodsParam);
-
- //瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
-
}
}
}
@@ -360,19 +344,19 @@
goodsParam.setGoodsId(goods.getId());
goodsParamMapper.insert(goodsParam);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(goodsParam.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(goodsParam.getPramaId());
+// cateParamSelect.setCategoryId(goods.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
return goods.getId();
@@ -469,7 +453,8 @@
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
goodsMapper.updateById(goods);
- multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId()));
+ multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId())
+ .eq("OBJ_TYPE",0).eq("COMPANY_ID",user.getCompanyId()));
List<Multifile> multifileList = goods.getMultifileList();
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
@@ -497,19 +482,19 @@
goodsParam.setGoodsId(goods.getId());
goodsParamMapper.insert(goodsParam);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(goodsParam.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(goodsParam.getPramaId());
- cateParamSelect.setCategoryId(goods.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(goodsParam.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(goodsParam.getPramaId());
+// cateParamSelect.setCategoryId(goods.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
}
@@ -677,7 +662,9 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(Goods::getStatus, pageWrap.getModel().getStatus());
}
-
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.eq(Goods::getType, pageWrap.getModel().getType());
+ }
if (pageWrap.getModel().getCategoryId() != null) {
queryWrapper.eq(Goods::getCategoryId, pageWrap.getModel().getCategoryId());
}
@@ -693,10 +680,6 @@
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
- if(i.getType().equals(Constants.ONE)){
- i.setBasePrice(i.getBasePrice().multiply(i.getBasePriceRate()));
- }
-
});
return PageData.from(goodsIPage);
}
@@ -875,19 +858,19 @@
//鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
goodsParamMapper.insert(gp);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(gp.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(gp.getPramaId());
- cateParamSelect.setCategoryId(newModel.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(gp.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(gp.getPramaId());
+// cateParamSelect.setCategoryId(newModel.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
if(mulFiles !=null && mulFiles.size()>0){
--
Gitblit v1.9.3