From 6d8ca83a81eb6601f22ca800a544faf5109f918f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 14:37:35 +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 f0f4f19..d5826fb 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,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);

--
Gitblit v1.9.3