From 7d13bbe39257ab5231d062e431fbb920c60d8ed5 Mon Sep 17 00:00:00 2001 From: Mr.Shi <1878285526@qq.com> Date: 星期二, 19 九月 2023 14:29:01 +0800 Subject: [PATCH] 企业端 --- server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 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 f0f4f19..db4a088 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 @@ -94,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()); @@ -370,6 +371,51 @@ return pageData; } + + @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()); + } + } + + 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::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()) + .notIn(!CollectionUtils.isEmpty(collect),BaseGoods::getId, collect); + + 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()); + }); + return pageData; + } + @Override public long count(BaseGoods baseGoods) { QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods); -- Gitblit v1.9.3