From 08e9a67dd679f311e79a27b04cd0c53a30b4bccf Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 04 六月 2026 18:33:22 +0800
Subject: [PATCH] aaa
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 442 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 261 insertions(+), 181 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 344e395..c1e1d93 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,6 +48,7 @@
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -352,9 +354,9 @@
goods.setCreateDate(new Date());
goods.setCreator(user.getId());
goods.setIsdeleted(Constants.ZERO);
- //澶勭悊鎷奸煶闂
goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
+ this.validateSubCategory(goods);
goodsMapper.insert(goods);
List<Multifile> multifileList = goods.getMultifileList();
@@ -379,6 +381,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
@@ -481,9 +484,9 @@
goods.setEditDate(new Date());
goods.setEditor(user.getId());
goods.setIsdeleted(Constants.ZERO);
- //澶勭悊鎷奸煶闂
goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
+ this.validateSubCategory(goods);
goodsMapper.updateById(goods);
multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId())
@@ -508,6 +511,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
@@ -646,6 +650,7 @@
queryWrapper.leftJoin(Category.class, Category::getId, Goods::getCategoryId);
queryWrapper.leftJoin(Brand.class, Brand::getId, Goods::getBrandId);
queryWrapper.eq(Goods::getStatus,Constants.ZERO);
+ queryWrapper.eq(Goods::getCompanyId, goods.getCompanyId());
queryWrapper.eq(Goods::getIsdeleted,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(goods.getAttrFirstIds()),Goods::getAttrFirstIds,goods.getAttrFirstIds());
queryWrapper.like(StringUtils.isNotBlank(goods.getAttrFirstNames()),Goods::getAttrFirstNames,goods.getAttrFirstNames());
@@ -656,7 +661,8 @@
queryWrapper.between(!Objects.isNull(goods.getSPrice())&&!Objects.isNull(goods.getEPrice()),
Goods::getPrice,goods.getSPrice(),goods.getEPrice());
queryWrapper.orderByDesc(Goods::getId);
- List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
+ List<Goods> goodsList = this.goodsMapper.selectListByCollection(goods);
+ // List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
if(!Objects.isNull(goodsList)&&goodsList.size()>Constants.ZERO){
this.dealGoodsMsg(goodsList);
}
@@ -735,120 +741,161 @@
@Override
public Integer importBatch(MultipartFile file){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- ExcelImporter ie = null;
- List<GoodsImport> dataList =null;
+ Boolean isGrouping = (Boolean)redisTemplate.opsForValue().get(user.getCompanyId()+Constants.COMPANY_IMPORT_GOODS);
+ if(isGrouping!=null && isGrouping ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠宸插瓨鍦ㄤ骇鍝佸鍏ユ搷浣滐紝姝ゆ鎿嶄綔鏃犳晥锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ redisTemplate.opsForValue().set(user.getCompanyId()+Constants.COMPANY_IMPORT_GOODS,true,30, TimeUnit.MINUTES);
+ int num =1,index =1;
try {
- ie = new ExcelImporter(file,0,0);
- dataList = ie.getDataList(GoodsImport.class,null);
- } catch (Exception e) {
- e.printStackTrace();
- }
- if(dataList == null || dataList.size() ==0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
- }
-
- int num =1;
- for(GoodsImport m: dataList){
- if(StringUtils.isBlank(m.getName())
- &&StringUtils.isBlank(m.getCategory())
- &&StringUtils.isBlank(m.getZdPrice())
- &&StringUtils.isBlank(m.getPrice())
- &&StringUtils.isBlank(m.getId())
- &&StringUtils.isBlank(m.getBrand())){
- continue;
+ ExcelImporter ie = new ExcelImporter(file,0,0);;
+ List<GoodsImport> dataList =ie.getDataList(GoodsImport.class,null);
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
}
- if(StringUtils.isBlank(m.getName())
- ||StringUtils.isBlank(m.getCategory())
- ||StringUtils.isBlank(m.getZdPrice())
- ||StringUtils.isBlank(m.getPrice())
- ||StringUtils.isBlank(m.getId())
- ||StringUtils.isBlank(m.getBrand())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鏁版嵁鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
- }
- Goods g = new Goods();
- g.setIsdeleted(Constants.ZERO);
- g.setRemark(m.getId());
- g.setCompanyId(user.getCompanyId());
- //鍝佺被鏁版嵁
- g = goodsMapper.selectOne(new QueryWrapper<>(g).last(" limit 1"));
- if(g != null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍥剧墖鏂囦欢澶归噸澶嶏紝璇锋鏌ヨ緭鍏ワ紒");
- }
- Category cate = new Category();
- cate.setIsdeleted(Constants.ZERO);
- cate.setName(m.getCategory());
- cate.setCompanyId(user.getCompanyId());
- //鍝佺被鏁版嵁
- cate = categoryMapper.selectOne(new QueryWrapper<>(cate).last(" limit 1"));
- if(cate == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧绫诲埆鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
- }
- Brand brand = new Brand();
- brand.setIsdeleted(Constants.ZERO);
- brand.setName(m.getBrand());
- //鍝佺被鏁版嵁
- QueryWrapper<Brand> qwrapper = new QueryWrapper<>(brand);
- qwrapper.lambda().and(wapper-> wapper.eq(Brand::getCompanyId ,user.getCompanyId()).or().eq(Brand::getType,Constants.ONE));
- brand = brandMapper.selectOne(qwrapper.last(" limit 1"));
- if(brand == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍝佺墝鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
- }
- 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());
- newModel.setCategoryId(cate.getId());
- newModel.setBrandId(brand.getId());
- newModel.setIsdeleted(Constants.ZERO);
- newModel.setCreator(user.getId());
- newModel.setCompanyId(user.getCompanyId());
- newModel.setCreateDate(new Date());
- newModel.setName(m.getName());
- newModel.setStatus(Constants.ZERO);
- try {
- newModel.setZdPrice(BigDecimal.valueOf(Double.parseDouble(m.getZdPrice())));
- newModel.setPrice(BigDecimal.valueOf(Double.parseDouble(m.getPrice())));
- }catch (Exception e){
-
- }
- if(newModel.getZdPrice() == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鎸囧浠锋棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
- }
- if(newModel.getPrice() == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍏ユ墜浠锋棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
- }
- newModel.setPinyin(PinYinUtil.getFullSpell(m.getName()));
- newModel.setShortPinyin(PinYinUtil.getFirstSpell(m.getName()));
-
- String[] params = StringUtils.defaultString(m.getParamStr(),"").split("\n");
- List<String> mulFiles = null;
String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GOODS_IMG_DIR).getCode() + proDir + File.separator + user.getCompanyId();
+ //鍝佺被鏁版嵁
+ List<Brand> brandList = brandMapper.selectList(new LambdaQueryWrapper<Brand>() .eq(Brand::getIsdeleted,Constants.ZERO)
+ .and(wapper-> wapper.eq(Brand::getCompanyId ,user.getCompanyId()).or().eq(Brand::getType,Constants.ONE)));
+ //浼佷笟浜у搧鏁版嵁
+ List<Goods> goodsList = goodsMapper.selectList(new LambdaQueryWrapper<Goods>() .eq(Goods::getIsdeleted,Constants.ZERO)
+ .eq(Goods::getCompanyId,user.getCompanyId()));
+ //鍝佺被鏁版嵁
+ List<Category> categoryList = categoryMapper.selectList(new LambdaQueryWrapper<Category>() .eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Category::getCompanyId,user.getCompanyId()));
+ //鏌ヨ鍏ㄩ儴浜у搧鍙傛暟閰嶇疆
+ List<CateParam> allParamsList = cateParamMapper.selectList(new LambdaQueryWrapper<CateParam>().eq(CateParam::getIsdeleted,Constants.ZERO));
+ for(GoodsImport m: dataList){
+ if(StringUtils.isBlank(m.getName())
+ &&StringUtils.isBlank(m.getCategory())
+ &&StringUtils.isBlank(m.getZdPrice())
+ &&StringUtils.isBlank(m.getPrice())
+ &&StringUtils.isBlank(m.getId())
+ &&StringUtils.isBlank(m.getBrand())){
+ // 鍏ㄩ儴绌鸿锛岃烦杩囧鐞�;
+ num++;
+ continue;
+ }
+ if(StringUtils.isBlank(m.getName())
+ ||StringUtils.isBlank(m.getCategory())
+ ||StringUtils.isBlank(m.getZdPrice())
+ ||StringUtils.isBlank(m.getPrice())
+ ||StringUtils.isBlank(m.getId())
+ ||StringUtils.isBlank(m.getBrand())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鏁版嵁鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
+ }
+ Goods g = new Goods();
+ g.setIsdeleted(Constants.ZERO);
+ g.setRemark(m.getId());
+ g.setCompanyId(user.getCompanyId());
+ //鍝佺被鏁版嵁
+ g = goodsMapper.selectOne(new QueryWrapper<>(g).last(" limit 1"));
+ if(g != null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍥剧墖鏂囦欢澶归噸澶嶏紝璇锋鏌ヨ緭鍏ワ紒");
+ }
+ Category cate = getCategroyByNameFromList(m.getCategory(),categoryList);
+ if(cate == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧绫诲埆鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
+ }
+ Brand brand = getImportBrandByNameFromList(m.getBrand(),brandList);
+ if(brand == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍝佺墝鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
+ }
+ if(findGoodsByNameFromList(m.getName(),goodsList) !=null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(num)+"銆戣浜у搧鍚嶇О銆�"+m.getName()+"銆戝凡瀛樺湪");
+ }
+ Goods newModel = new Goods();
+ newModel.setRemark(m.getId());
+ newModel.setCategoryId(cate.getId());
+ newModel.setBrandId(brand.getId());
+ newModel.setIsdeleted(Constants.ZERO);
+ newModel.setCreator(user.getId());
+ newModel.setCompanyId(user.getCompanyId());
+ newModel.setCreateDate(new Date());
+ newModel.setName(m.getName());
+ newModel.setStatus(Constants.ZERO);
+ try {
+ newModel.setZdPrice(BigDecimal.valueOf(Double.parseDouble(m.getZdPrice())));
+ newModel.setPrice(BigDecimal.valueOf(Double.parseDouble(m.getPrice())));
+ }catch (Exception e){
- String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GOODS_IMG_DIR).getCode()
- + proDir + File.separator + user.getCompanyId();
- if(StringUtils.isNotBlank(path)){
- OssModel ossModel = baseDataService.initOssModel();
- File dir =new File(path+File.separator+newModel.getRemark()+File.separator);
- if(dir!=null && dir.isDirectory()){
- File[] files = dir.listFiles();
- if(files!=null && files.length>0){
- for(File f:files){
- if(StringUtils.isBlank(newModel.getImgurl()) && isImgFile(f)){
- //鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
- newModel.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
- }
- if((mulFiles ==null || mulFiles.size() == 0) && f.isDirectory()){
- //濡傛灉鏄枃浠跺す
- File[] fs = f.listFiles();
- if(fs!=null && fs.length>0){
- for(File mf : fs){
- if(isImgFile(mf)){
- if(mulFiles==null){
- mulFiles = new ArrayList<>();
- }
- mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),mf));
+ }
+ if(newModel.getZdPrice() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鎸囧浠锋棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
+ }
+ if(newModel.getPrice() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍏ユ墜浠锋棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
+ }
+ newModel.setPinyin(PinYinUtil.getFullSpell(m.getName()));
+ newModel.setShortPinyin(PinYinUtil.getFirstSpell(m.getName()));
+ List<String> mulFiles =getGoodsImageFileList(newModel,path);
+ //鏌ヨ鍟嗗搧淇℃伅
+ goodsMapper.insert(newModel);
+ //鍔犲叆鍒板凡缁忓瓨鍦ㄧ殑浜у搧闆嗗悎涓紝鐢ㄤ簬涓嬩竴涓俊鎭幓閲嶅鐞�
+ goodsList.add(newModel);
+ //澶勭悊浜у搧灞炴�т笟鍔�
+ dealGoodsParamBiz(cate,newModel,m,allParamsList,num);
+ //澶勭悊浜у搧鍥剧墖璧勬簮涓氬姟
+ dealGoodsImagesBiz(mulFiles,newModel);
+
+ index++;//璁板綍瀵煎叆浜у搧鎴愬姛+1
+ }
+ }catch (BusinessException e){
+ throw e;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵煎叆浜у搧鏁版嵁鍙戠敓寮傚父锛岃绋嶅悗閲嶈瘯锛�");
+ }finally {
+ redisTemplate.opsForValue().set(user.getCompanyId()+Constants.COMPANY_IMPORT_GOODS,false);
+ }
+ return index;
+ }
+
+ private void dealGoodsImagesBiz(List<String> mulFiles, Goods newModel) {
+ if(mulFiles !=null && mulFiles.size()>0){
+ List<Multifile> multifileList = new ArrayList<>();
+ for(int i=0;i<mulFiles.size();i++){
+ String s = mulFiles.get(i);
+ Multifile f = new Multifile();
+ f.setObjType(Constants.ZERO);
+ f.setName(s);
+ f.setType(Constants.ZERO);
+ f.setObjId(newModel.getId());
+ f.setCreateDate(newModel.getCreateDate());
+ f.setCreator(newModel.getCreator());
+ f.setIsdeleted(Constants.ZERO);
+ f.setSortnum(i);
+ f.setCompanyId(newModel.getCompanyId());
+ f.setFileurl(s);
+ multifileList.add(f);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ }
+
+ private List<String> getGoodsImageFileList(Goods newModel, String path) {
+ List<String> mulFiles = null;
+ if(StringUtils.isNotBlank(path)){
+ OssModel ossModel = baseDataService.initOssModel();
+ File dir =new File(path+File.separator+newModel.getRemark()+File.separator);
+ if(dir!=null && dir.isDirectory()){
+ File[] files = dir.listFiles();
+ if(files!=null && files.length>0){
+ for(File f:files){
+ if(StringUtils.isBlank(newModel.getImgurl()) && isImgFile(f)){
+ //鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
+ newModel.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
+ }
+ if((mulFiles ==null || mulFiles.size() == 0) && f.isDirectory()){
+ //濡傛灉鏄枃浠跺す
+ File[] fs = f.listFiles();
+ if(fs!=null && fs.length>0){
+ for(File mf : fs){
+ if(isImgFile(mf)){
+ if(mulFiles==null){
+ mulFiles = new ArrayList<>();
}
+ mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),mf));
}
}
}
@@ -856,78 +903,99 @@
}
}
}
- //鏌ヨ鍟嗗搧淇℃伅
- goodsMapper.insert(newModel);
- CateParam cp = new CateParam();
- cp.setIsdeleted(Constants.ZERO);
- cp.setCategoryId(cate.getId());
- //鏌ヨ鍏ㄩ儴浜у搧鍙傛暟閰嶇疆
- List<CateParam> allParams = cateParamMapper.selectList(new QueryWrapper<>(cp));
- if(params.length > 0){
- for(String s : params){
- if(StringUtils.isBlank(s)){
- continue;
- }
- s = s.replace("锛�",":");
- String[] ts = s.split(":");
- if(ts.length == 0){
- continue;
- }
- //鏌ヨ灞炴�ц鏍煎璞�
- CateParam ta = getCateParamByName(ts[0], allParams);
- if(ta == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣浜у搧鍙傛暟涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
- }
- GoodsParam gp = new GoodsParam();
- gp.setIsdeleted(Constants.ZERO);
- gp.setCreator(user.getId());
- gp.setCreateDate(newModel.getCreateDate());
- gp.setGoodsId(newModel.getId());
- gp.setName(ta.getName());
- gp.setPramaId(ta.getId());
- gp.setStatus(Constants.ZERO);
- gp.setVal(ts.length>1?ts[1]:null);
- gp.setSortnum(ta.getSortnum());
- //鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
- 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(mulFiles !=null && mulFiles.size()>0){
- for(int i=0;i<mulFiles.size();i++){
- String s = mulFiles.get(i);
- Multifile f = new Multifile();
- f.setObjType(Constants.ZERO);
- f.setName(s);
- f.setType(Constants.ZERO);
- f.setObjId(newModel.getId());
- f.setCreateDate(newModel.getCreateDate());
- f.setCreator(newModel.getCreator());
- f.setIsdeleted(Constants.ZERO);
- f.setSortnum(i);
- f.setCompanyId(user.getCompanyId());
- f.setFileurl(s);
- multifileMapper.insert(f);
- }
- }
- num++;
}
- return num;
+ return mulFiles;
+ }
+
+ private void dealGoodsParamBiz(Category cate, Goods newModel, GoodsImport m, List<CateParam> allParamsList,int num) {
+ List<GoodsParam> paramList = new ArrayList<>();
+ String[] params = StringUtils.defaultString(m.getParamStr(),"").split("\n");
+ //鏌ヨ鍏ㄩ儴浜у搧鍙傛暟閰嶇疆
+ List<CateParam> allParams =getCateParamByCateid(cate.getId(),allParamsList);
+ if(params.length > 0){
+ for(String s : params){
+ if(StringUtils.isBlank(s)){
+ continue;
+ }
+ s = s.replace("锛�",":");
+ String[] ts = s.split(":");
+ if(ts.length == 0){
+ continue;
+ }
+ //鏌ヨ灞炴�ц鏍煎璞�
+ CateParam ta = getCateParamByName(ts[0], allParams);
+ if(ta == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣浜у搧鍙傛暟涓��"+s+"銆戞棤鏁堬紝璇锋鏌ヨ緭鍏ワ紒");
+ }
+ GoodsParam gp = new GoodsParam();
+ gp.setIsdeleted(Constants.ZERO);
+ gp.setCreator(newModel.getCreator());
+ gp.setCreateDate(newModel.getCreateDate());
+ gp.setGoodsId(newModel.getId());
+ gp.setName(ta.getName());
+ gp.setPramaId(ta.getId());
+ gp.setStatus(Constants.ZERO);
+ gp.setVal(ts.length>1?ts[1]:null);
+ gp.setSortnum(ta.getSortnum());
+ //鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
+ paramList.add(gp);
+// goodsParamMapper.insert(gp);
+ }
+ }
+ if(paramList.size() >0){
+ goodsParamMapper.insert(paramList);
+ }
}
+
+ private Goods findGoodsByNameFromList(String name, List<Goods> goodsList) {
+ if(goodsList!=null){
+ for(Goods brand :goodsList){
+ if(StringUtils.equals(name.trim(),brand.getName())){
+ return brand;
+ }
+ }
+ }
+ return null;
+ }
+
+ private List<CateParam> getCateParamByCateid(Integer cateid, List<CateParam> allParamsList) {
+ List<CateParam> list = null;
+
+ if(allParamsList!=null){
+ for(CateParam brand :allParamsList){
+ if(Constants.equalsInteger(cateid,brand.getCategoryId())){
+ if(list == null){
+ list = new ArrayList<>();
+ }
+ list.add(brand);
+ }
+ }
+ }
+ return list;
+ }
+ private Category getCategroyByNameFromList(String name, List<Category> categoryList) {
+ if(categoryList!=null){
+ for(Category brand :categoryList){
+ if(StringUtils.equals(name.trim(),brand.getName())){
+ return brand;
+ }
+ }
+ }
+ return null;
+ }
+
+ private Brand getImportBrandByNameFromList(String name, List<Brand> brandList) {
+ if(brandList!=null){
+ for(Brand brand :brandList){
+ if(StringUtils.equals(name.trim(),brand.getName())){
+ return brand;
+ }
+ }
+ }
+ return null;
+ }
+
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
@Override
public Integer importBatchImg(MultipartFile file){
@@ -1187,6 +1255,7 @@
queryWrapper.eq(Goods::getIsdeleted,Constants.ZERO);
queryWrapper.eq(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getCategoryId()), Goods::getCategoryId, pageWrap.getModel().getCategoryId())
+ .eq(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getSubCategoryId()), Goods::getSubCategoryId, pageWrap.getModel().getSubCategoryId())
.eq(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getBrandId()), Goods::getBrandId, pageWrap.getModel().getBrandId())
.and(!Objects.isNull(pageWrap.getModel()) && StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),
i->i.like(Goods::getPinyin,pageWrap.getModel().getKeyword())
@@ -1207,6 +1276,16 @@
this.dealGoodsMsg(goodsIPage.getRecords());
}
return PageData.from(goodsIPage);
+ }
+
+ private void validateSubCategory(Goods goods) {
+ if (goods.getSubCategoryId() == null) {
+ return;
+ }
+ Category sub = categoryMapper.selectById(goods.getSubCategoryId());
+ if (sub == null || sub.getParentId() == null || !sub.getParentId().equals(goods.getCategoryId())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浜岀骇绫诲埆蹇呴』灞炰簬鎵�閫変竴绾у搧绫�");
+ }
}
@@ -1253,6 +1332,7 @@
queryWrapper.eq(Goods::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goods::getCompanyId,loginUserInfo.getCompanyId());
queryWrapper.eq(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getCategoryId()), Goods::getCategoryId, goodsRequest.getCategoryId())
+ .eq(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getSubCategoryId()), Goods::getSubCategoryId, goodsRequest.getSubCategoryId())
.eq(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getBrandId()), Goods::getBrandId, goodsRequest.getBrandId())
.and(!Objects.isNull(goodsRequest) && StringUtils.isNotBlank(goodsRequest.getKeyword()),
i->i.like(Goods::getPinyin,goodsRequest.getKeyword())
--
Gitblit v1.9.3