优化

MrShi

2024-10-25 78b648fbf1f44061face21fa2511e791ccfbbdc2

 server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java

@@ -150,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
@@ -164,7 +169,10 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        baseGoodsMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            deleteById(id);
        }
//        baseGoodsMapper.deleteBatchIds(ids);
    }


@@ -301,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.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        baseGoodsDTO.setImgfullurl(prefixUrl+baseGoodsDTO.getImgurl());
        baseGoodsDTO.setImgfullurl(StringUtils.isNotBlank(baseGoodsDTO.getImgurl()) ? prefixUrl+baseGoodsDTO.getImgurl() : null);

        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>()
                .eq("OBJ_ID", id)
@@ -351,8 +359,11 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
                    .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(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())
@@ -366,7 +377,11 @@
        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());
             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;
    }
@@ -383,6 +398,7 @@
                .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)
@@ -391,13 +407,15 @@
                .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.company_id = "+user.getCompanyId()+"  ");
                .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;
    }
@@ -508,6 +526,8 @@
//                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){
@@ -530,30 +550,38 @@

                String baseGoodsParamString = s.getBaseGoodsParamString();
                List<List<String>> collect = Arrays.asList(baseGoodsParamString.split("\n"))
                        .stream().map(s1 -> Arrays.asList(s1.split("[：,:]")) ).collect(Collectors.toList());
                if (!CollectionUtils.isEmpty(collect)) {
                    for (int i = 0; i < collect.size(); i++) {
                        if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())) {
                            List<String> s2 = collect.get(i);
                            BaseCateParam baseCateParam = baseCategory.getBaseCateParamList()
                                    .stream().filter(s3 -> s3.getName().equals(s2.get(0))).findFirst()
                                    .orElseThrow(() -> new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "配置参数【】不存在"));
                            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.setVal(s2.size() > 1 ? s2.get(1) : null);
                            baseGoodsParam.setGoodsId(baseGoods.getId());
                            baseGoodsParamMapper.insert(baseGoodsParam);
                        .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);
                    }
                    ;
                }