From 6fcaaff0895c06bdbad8310559676528840394cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 15:31:33 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 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 a4f7709..60ffc27 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
@@ -81,9 +81,9 @@
@Override
public Integer create(BaseGoodsCreateOrUpdateRequest baseGoods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO).eq("name",baseGoods.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
- }
+// if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO).eq("name",baseGoods.getName()))>0){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
+// }
Integer integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO));
BaseGoods insert = new BaseGoods();
@@ -173,11 +173,11 @@
public void update(BaseGoodsCreateOrUpdateRequest baseGoods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>()
- .eq("ISDELETED",Constants.ZERO).ne("id",baseGoods.getId())
- .eq("name",baseGoods.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
- }
+// if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>()
+// .eq("ISDELETED",Constants.ZERO).ne("id",baseGoods.getId())
+// .eq("name",baseGoods.getName()))>0){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
+// }
UpdateWrapper<BaseGoods> wrapper = new UpdateWrapper<>();
wrapper.lambda()
@@ -373,21 +373,8 @@
@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());
- }
- }
-
+ 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<>();
@@ -404,8 +391,7 @@
.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);
-
+ .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()
@@ -477,11 +463,12 @@
QueryWrapper<Brand> brandQuery = new QueryWrapper<>();
brandQuery.lambda()
+ .eq(Brand::getType,Constants.ONE)
.eq(Brand::getName,s.getBrandName());
brandQuery.lambda()
.eq(Brand::getIsdeleted,Constants.ZERO);
brandQuery.lambda()
- .eq(Brand::getType,Constants.ZERO);
+ .eq(Brand::getType,Constants.ONE);
Brand brand = brandMapper.selectOne(brandQuery.last("limit 1"));
if (Objects.isNull(brand)){
@@ -495,7 +482,7 @@
File[] files = dir.listFiles();
if(files!=null && files.length>0){
for(File f:files){
- if(StringUtils.isBlank(baseCategory.getImgurl()) && isImgFile(f)){
+ if(isImgFile(f)){
//鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
baseGoods.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
}
--
Gitblit v1.9.3