修改

jiangping

2023-09-19 62f53cc6c69c02bbe91a5010ee98f293ae3746bb

 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()
@@ -373,21 +373,8 @@


    @Override
    public PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap ,Integer companyId) {

        //查询企业已经存在的商品
        List<Integer> collect = new ArrayList<>();
        if(Objects.nonNull(companyId)){
            QueryWrapper<Goods> goodsQuery = new QueryWrapper<>();
            goodsQuery.lambda().eq(Goods::getIsdeleted,Constants.ZERO)
                    .eq(Goods::getCompanyId,companyId)
                    .isNotNull(Goods::getGoodsId);
            List<Goods> goods = goodsMapper.selectList(goodsQuery);
            if (CollectionUtils.isEmpty(goods)){
                 collect = goods.stream().map(s -> s.getGoodsId()).collect(Collectors.toList());
            }
        }

    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<>();
@@ -404,8 +391,7 @@
                .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())
                .notIn(!CollectionUtils.isEmpty(collect),BaseGoods::getId, collect);

                .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.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()
@@ -435,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);
@@ -477,11 +464,12 @@

                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.ZERO);
                        .eq(Brand::getType,Constants.ONE);
                Brand brand = brandMapper.selectOne(brandQuery.last("limit 1"));

                if (Objects.isNull(brand)){
@@ -495,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));
                                }
@@ -526,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());