From b17eb6082e501ab795d99fa32c2fb4255b88af48 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 16:54:15 +0800
Subject: [PATCH] #文件地址
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 3447930..43775a3 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
@@ -81,9 +81,9 @@
@Override
public Integer create(BaseGoodsCreateOrUpdateRequest baseGoods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO).eq("name",baseGoods.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
- }
+// if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO).eq("name",baseGoods.getName()))>0){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
+// }
Integer integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO));
BaseGoods insert = new BaseGoods();
@@ -173,11 +173,11 @@
public void update(BaseGoodsCreateOrUpdateRequest baseGoods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>()
- .eq("ISDELETED",Constants.ZERO).ne("id",baseGoods.getId())
- .eq("name",baseGoods.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
- }
+// if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>()
+// .eq("ISDELETED",Constants.ZERO).ne("id",baseGoods.getId())
+// .eq("name",baseGoods.getName()))>0){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
+// }
UpdateWrapper<BaseGoods> wrapper = new UpdateWrapper<>();
wrapper.lambda()
@@ -421,9 +421,10 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
}
//澶勭悊鎵归噺涓婁紶
- String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLATFORM).getCode();
+ String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
+ String platformDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLATFORM).getCode();
String basePath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GOODS_IMG_DIR).getCode()
- + proDir + File.separator ;
+ + proDir + platformDir ;
OssModel ossModel = baseDataService.initOssModel();
for (int index = 0; index < dataList.size(); index++) {
BaseGoodsImportDTO s = dataList.get(index);
@@ -468,7 +469,7 @@
brandQuery.lambda()
.eq(Brand::getIsdeleted,Constants.ZERO);
brandQuery.lambda()
- .eq(Brand::getType,Constants.ZERO);
+ .eq(Brand::getType,Constants.ONE);
Brand brand = brandMapper.selectOne(brandQuery.last("limit 1"));
if (Objects.isNull(brand)){
@@ -482,7 +483,7 @@
File[] files = dir.listFiles();
if(files!=null && files.length>0){
for(File f:files){
- if(StringUtils.isBlank(baseCategory.getImgurl()) && isImgFile(f)){
+ if(isImgFile(f)){
//鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
baseGoods.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
}
@@ -513,7 +514,7 @@
for(int i=0;i<mulFiles.size();i++){
String str = mulFiles.get(i);
Multifile f = new Multifile();
- f.setObjType(Constants.ZERO);
+ f.setObjType(Constants.ONE);
f.setName(str);
f.setType(Constants.ZERO);
f.setObjId(baseGoods.getId());
--
Gitblit v1.9.3