From 7fc79e5c6c98fa7fe1e2279572251a45f0970c65 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:46:56 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java | 10 ++++++++++
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
index e88130c..753912f 100644
--- a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
@@ -125,6 +125,16 @@
*/
PageData<BaseGoods> findPage(PageWrap<BaseGoods> pageWrap);
+
+
+ /**
+ * 鍏徃鏌ヨ骞冲彴鍟嗗搧
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<BaseGoods>
+ */
+ PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap,Integer companyId);
+
/**
* 鏉′欢缁熻
*
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..22aafac 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
@@ -370,6 +370,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