From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java |  364 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 315 insertions(+), 49 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 28dcfe1..e45e5e6 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
@@ -1,6 +1,7 @@
 package com.doumee.service.business.impl;
 
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelImporter;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -12,31 +13,35 @@
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.join.BaseGoodsJoinMapper;
 import com.doumee.dao.business.model.*;
-import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
-import com.doumee.dao.business.model.dto.BaseGoodsDTO;
-import com.doumee.dao.business.model.dto.BaseGoodsParamCreatRequest;
+import com.doumee.dao.business.model.dto.*;
+import com.doumee.service.business.BaseDataService;
 import com.doumee.service.business.BaseGoodsService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 绱犳潗搴�-鍟嗗搧淇℃伅琛⊿ervice瀹炵幇
  * @author 姹熻箘韫�
  * @date 2023/09/07 11:41
  */
+@Slf4j
 @Service
 public class BaseGoodsServiceImpl implements BaseGoodsService {
 
@@ -64,14 +69,23 @@
     @Autowired
     private GoodsMapper goodsMapper;
 
+    @Autowired
+    private BaseCategoryMapper baseCategoryMapper;
+
+
+    @Autowired
+    @Lazy
+    private BaseDataService baseDataService;
+
+
     @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));
+        Long integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO));
         BaseGoods insert = new BaseGoods();
         insert.setCreator(user.getId());
         insert.setCreateDate(new Date());
@@ -80,7 +94,8 @@
         insert.setIsdeleted(Constants.ZERO);
         insert.setRemark(baseGoods.getRemark());
         insert.setName(baseGoods.getName());
-        insert.setStatus(Constants.ZERO);
+        //榛樿涓嬫灦
+        insert.setStatus(Constants.ONE);
         insert.setSortnum(integer+Constants.ONE);
         insert.setImgurl(baseGoods.getImgurl());
         insert.setCategoryId(baseGoods.getCategoryId());
@@ -135,7 +150,12 @@
 
     @Override
     public void deleteById(Integer id) {
-        baseGoodsMapper.deleteById(id);
+        BaseGoods model = new BaseGoods();
+        model.setId(id);
+        model.setEditDate(new Date());
+        model.setIsdeleted(Constants.ONE);
+        updateById(model);
+//        baseGoodsMapper.deleteById(id);
     }
 
     @Override
@@ -149,7 +169,10 @@
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        baseGoodsMapper.deleteBatchIds(ids);
+        for(Integer id : ids){
+            deleteById(id);
+        }
+//        baseGoodsMapper.deleteBatchIds(ids);
     }
 
 
@@ -158,11 +181,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()
@@ -216,29 +239,36 @@
 
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     @Override
-    public void updateStatusByIds(List<Integer> idList, Integer status) {
-        if (CollectionUtils.isEmpty(idList)){
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
+    public void updateStatusByIds(BaseGoods param) {
+        if (CollectionUtils.isEmpty(param.getIdList())
+                || param.getStatus() == null
+               || !(Constants.equalsInteger(param.getStatus(), Constants.ONE)||Constants.equalsInteger(param.getStatus()  ,Constants.ZERO))){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        idList.forEach(s->updateStatusById(s,status));
-
+        param.getIdList().forEach(s->updateStatusById(s,param.getStatus()));
     }
 
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     @Override
     public void updateStatusById(Integer id, Integer status) {
-
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if (Objects.isNull(status)){
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
         }
         if (Constants.equalsInteger(status,Constants.ZERO)){
+            //濡傛灉鍚敤
             BaseGoods baseGoods = new BaseGoods();
             baseGoods.setId(id);
+            baseGoods.setEditDate(new Date());
+            baseGoods.setEditor(user.getId());
             baseGoods.setStatus(status);
             baseGoodsMapper.updateById(baseGoods);
         }else if (Constants.equalsInteger(status,Constants.ONE)){
+            //濡傛灉绂佺敤
             BaseGoods baseGoods = new BaseGoods();
             baseGoods.setId(id);
+            baseGoods.setEditDate(new Date());
+            baseGoods.setEditor(user.getId());
             baseGoods.setStatus(status);
             baseGoodsMapper.updateById(baseGoods);
 
@@ -246,7 +276,9 @@
             goodsUpdate.lambda()
                         .eq(Goods::getType,Constants.ONE)
                         .eq(Goods::getGoodsId,id)
-                        .set(Goods::getStatus,Constants.ONE);
+                        .set(Goods::getStatus,Constants.ONE)
+                        .set(Goods::getEditor,user.getId())
+                        .set(Goods::getEditDate,new Date());
             goodsMapper.update(null,goodsUpdate);
         }
     }
@@ -277,16 +309,16 @@
         MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
 
         queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
-                .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getBaseDataId)
+                .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId)
                 .selectAll(BaseGoods.class)
                 .selectAs(Brand::getName,BaseGoodsDTO::getBrandName)
-                .selectAs(BaseCategory::getSortnum,BaseGoodsDTO::getCategoryName)
+                .selectAs(BaseCategory::getName,BaseGoodsDTO::getCategoryName)
                 .eq(BaseGoods::getId,id);
 
         BaseGoodsDTO baseGoodsDTO = baseGoodsJoinMapper.selectJoinOne(BaseGoodsDTO.class, queryWrapper);
-        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
-                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
-        baseGoodsDTO.setImgfullurl(prefixUrl+baseGoodsDTO.getImgurl());
+        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
+        baseGoodsDTO.setImgfullurl(StringUtils.isNotBlank(baseGoodsDTO.getImgurl()) ? prefixUrl+baseGoodsDTO.getImgurl() : null);
 
         List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>()
                 .eq("OBJ_ID", id)
@@ -321,31 +353,71 @@
 
     @Override
     public PageData<BaseGoods> findPage(PageWrap<BaseGoods> pageWrap) {
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
         IPage<BaseGoods> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.like(BaseGoods::getId, pageWrap.getModel().getId());
-        }
-        if (pageWrap.getModel().getName() != null) {
-            queryWrapper.eq(BaseGoods::getName, pageWrap.getModel().getName());
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.eq(BaseGoods::getStatus, pageWrap.getModel().getStatus());
-        }
-        if (pageWrap.getModel().getCategoryId() != null) {
-            queryWrapper.eq(BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId());
-        }
-        if (pageWrap.getModel().getBrandId() != null) {
-            queryWrapper.eq(BaseGoods::getBrandId, pageWrap.getModel().getBrandId());
-        }
         queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
-                    .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getBaseDataId)
+                    .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId)
+//                    .leftJoin(BaseData.class,BaseData::getId,BaseGoods::getBaseDataId)
+                    .selectAll(BaseGoods.class)
+                    .selectAs(BaseCategory::getPriceRate,BaseGoods::getCateRatePrice)
                     .selectAs(Brand::getName,BaseGoods::getBrandName)
-                    .selectAs(BaseCategory::getSortnum,BaseGoods::getCategoryName);
+//                    .selectAs(BaseData::getPrice,BaseGoods::getJdPrice)
+                    .selectAs(BaseCategory::getName,BaseGoods::getCategoryName)
+                    .eq(BaseGoods::getIsdeleted, Constants.ZERO)
+                    .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
+                    .like(pageWrap.getModel().getId()!=null,BaseGoods::getId, pageWrap.getModel().getId())
+                    .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());
+
         queryWrapper.orderByDesc(Goods::getId);
-        return PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
+        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->{
+             if(StringUtils.isNotBlank(i.getImgurl())){
+                 i.setFullImgUrl(prefixUrl + i.getImgurl());
+             }
+             i.setJdPrice(i.getPrice());
+             i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice())));
+        });
+        return pageData;
+    }
+
+
+    @Override
+    public PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap) {
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
+        IPage<BaseGoods> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+        queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
+                .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)
+                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
+                .like(pageWrap.getModel().getId()!=null,BaseGoods::getId, pageWrap.getModel().getId())
+                .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.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;
     }
 
     @Override
@@ -353,4 +425,198 @@
         QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods);
         return baseGoodsMapper.selectCount(wrapper);
     }
+
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    @Override
+    public Integer importBaseGoodsBatch(MultipartFile file) {
+
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        try {
+
+            ExcelImporter ie = new ExcelImporter(file,0,0);
+            List<BaseGoodsImportDTO> dataList = ie.getDataList(BaseGoodsImportDTO.class,null);
+            if(dataList == null || dataList.size() ==0){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.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 + platformDir ;
+            OssModel ossModel = baseDataService.initOssModel();
+            for (int index = 0; index < dataList.size(); index++) {
+                BaseGoodsImportDTO  s = dataList.get(index);
+                if(existedIdInList(s.getId(),index,dataList)){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(1+index)+"琛屻�戝晢鍝佺紪鍙枫��"+s.getId()+"銆戝湪琛ㄦ牸涓噸澶�");
+                }
+                if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().lambda().eq(BaseGoods::getIsdeleted, Constants.ZERO)
+                        .eq(BaseGoods::getBaseDataId,s.getId())
+                        .eq(BaseGoods::getOrigin,Constants.BasegoodsOrigin.imported))>0){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(1+index)+"琛屻�戝晢鍝佺紪鍙枫��"+s.getId()+"銆戝凡瀵煎叆锛�");
+                }
+
+                BaseGoods baseGoods = new BaseGoods();
+                baseGoods.setCreator(user.getId());
+                baseGoods.setOrigin(Constants.BasegoodsOrigin.imported);
+                baseGoods.setBaseDataId(s.getId());
+                baseGoods.setCreateDate(new Date());
+                baseGoods.setEditor(user.getId());
+                baseGoods.setEditDate(new Date());
+                baseGoods.setIsdeleted(Constants.ZERO);
+                baseGoods.setName(s.getName());
+                baseGoods.setStatus(Constants.ZERO);
+                baseGoods.setZdPrice(new BigDecimal(s.getZdPrice()));
+                baseGoods.setPrice(new BigDecimal(s.getPrice()));
+                if (StringUtils.isBlank(s.getCategoryName())){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绗��"+(1+index)+"琛屻�戝晢鍝佺被鍒笉鍙负绌�");
+                }
+                QueryWrapper<BaseCategory> categoryQuery = new QueryWrapper<>();
+                categoryQuery.lambda()
+                    .eq(BaseCategory::getName,s.getCategoryName());
+                categoryQuery.lambda()
+                    .eq(BaseCategory::getIsdeleted,Constants.ZERO);
+                BaseCategory baseCategory = baseCategoryMapper.selectOne(categoryQuery.last(" limit 1"));
+                if (Objects.isNull(baseCategory)){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绗��"+(1+index)+"琛屻�戝晢鍝佺被鍒��"+s.getCategoryName()+"銆戜笉瀛樺湪");
+                }
+
+                QueryWrapper<Brand> brandQuery = new QueryWrapper<>();
+                brandQuery.lambda()
+                        .eq(Brand::getType,Constants.ONE)
+                        .eq(Brand::getName,s.getBrandName());
+                brandQuery.lambda()
+                        .eq(Brand::getIsdeleted,Constants.ZERO);
+                brandQuery.lambda()
+                        .eq(Brand::getType,Constants.ONE);
+                Brand brand = brandMapper.selectOne(brandQuery.last("limit 1"));
+
+                if (Objects.isNull(brand)){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绗��"+(1+index)+"琛屻�戝晢鍝佸搧鐗屻��"+s.getBrandName()+"銆戜笉瀛樺湪");
+                }
+                String path =basePath+ s.getId();
+                List<String> mulFiles = new ArrayList<>();
+                if(StringUtils.isNotBlank(path)){
+                    File dir =new File(path+File.separator);
+                    if(dir!=null && dir.isDirectory()){
+                        File[]  files = dir.listFiles();
+                        if(files!=null && files.length>0){
+                            for(File f:files){
+                                if(isImgFile(f)){
+                                    //鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
+                                    baseGoods.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
+                                }
+                                if(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));
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+//                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){
+                    for(int i=0;i<mulFiles.size();i++){
+                        String str = mulFiles.get(i);
+                        Multifile f = new Multifile();
+                        f.setObjType(Constants.ONE);
+                        f.setName(str);
+                        f.setType(Constants.ZERO);
+                        f.setObjId(baseGoods.getId());
+                        f.setCreateDate(new Date());
+                        f.setCreator(user.getId());
+                        f.setIsdeleted(Constants.ZERO);
+                        f.setSortnum(i);
+                        f.setCompanyId(user.getCompanyId());
+                        f.setFileurl(str);
+                        multifileMapper.insert(f);
+                    }
+                }
+
+                String baseGoodsParamString = s.getBaseGoodsParamString();
+                List<List<String>> collect = Arrays.asList(baseGoodsParamString.split("\n"))
+                        .stream()
+                        .map(s1 -> Arrays.asList(s1.split("[锛�,:]")) )
+                        .filter(s1->!CollectionUtils.isEmpty(s1))
+                        .collect(Collectors.toList());
+
+                if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())) {
+                    for (int i = 0; i < baseCategory.getBaseCateParamList().size(); i++) {
+
+                        BaseCateParam baseCateParam = baseCategory.getBaseCateParamList().get(i);
+
+                        BaseGoodsParam baseGoodsParam = new BaseGoodsParam();
+                        baseGoodsParam.setCreator(user.getId());
+                        baseGoodsParam.setCreateDate(new Date());
+                        baseGoodsParam.setEditor(user.getId());
+                        baseGoodsParam.setEditDate(new Date());
+                        baseGoodsParam.setIsdeleted(Constants.ZERO);
+                        baseGoodsParam.setName(baseCateParam.getName());
+                        baseGoodsParam.setRemark(baseCateParam.getRemark());
+                        baseGoodsParam.setStatus(Constants.ZERO);
+                        baseGoodsParam.setSortnum(i + Constants.ONE);
+                        baseGoodsParam.setPramaId(baseCateParam.getId());
+                        baseGoodsParam.setGoodsId(baseGoods.getId());
+
+                        if (!CollectionUtils.isEmpty(collect)) {
+                            List<String> list = collect.stream()
+                                    .filter(s3 -> s3.get(0).equals(baseCateParam.getName()))
+                                    .findFirst()
+                                    .orElse(new ArrayList<>());
+                            baseGoodsParam.setVal(list.size() > 1 ? list.get(1) : null);
+                        }
+
+                        baseGoodsParamMapper.insert(baseGoodsParam);
+                    }
+                    ;
+                }
+
+            }
+        }catch (Exception e) {
+            log.error(String.format("鎵归噺鎻掑叆寮傚父%s ",e.getMessage()));
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage());
+        }finally {
+
+        }
+        return null;
+    }
+
+    private boolean existedIdInList(String id,int index, List<BaseGoodsImportDTO> dataList) {
+        for (int j = 0; j <dataList.size(); j++) {
+            if(index!=j && StringUtils.equals(id,dataList.get(j).getId())){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isImgFile(File f) {
+        if(f!=null && f.isFile() ){
+            String name = f.getName();
+            if(name.endsWith(".jpg")
+                    ||name.endsWith(".JPG")
+                    ||name.endsWith(".JPEG")
+                    ||name.endsWith(".jpeg")
+                    ||name.endsWith(".PNG")
+                    ||name.endsWith(".png")){
+                return  true;
+            }
+        }
+        return  false;
+    }
 }

--
Gitblit v1.9.3