From b5aa2c49f7a801de9af91eec71e339ff6d2781bb Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 14:55:24 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 e240c3a..70c6bb7 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
@@ -371,6 +371,37 @@
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::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.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());
+ });
+ return pageData;
+ }
+
@Override
public long count(BaseGoods baseGoods) {
QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods);
@@ -428,7 +459,7 @@
}
QueryWrapper<BaseCategory> categoryQuery = new QueryWrapper<>();
categoryQuery.lambda()
- .eq(BaseCategory::getName,s.getCategoryName());
+ .eq(BaseCategory::getName,s.getCategoryName());
BaseCategory baseCategory = baseCategoryMapper.selectOne(categoryQuery);
if (Objects.isNull(baseCategory)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧绫诲埆涓嶅瓨鍦�");
@@ -436,6 +467,7 @@
QueryWrapper<Brand> brandQuery = new QueryWrapper<>();
brandQuery.lambda()
+ .eq(Brand::getType,Constants.ONE)
.eq(Brand::getName,s.getBrandName());
Brand brand = brandMapper.selectOne(brandQuery);
--
Gitblit v1.9.3