From 36d1f24952e857c971aed06042f6c7ebba6b147e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 11:25:20 +0800
Subject: [PATCH] sf
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index c228633..fc4b844 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -379,6 +379,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
@@ -508,6 +509,7 @@
if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){
for (int i = 0; i < goodsParamList.size(); i++) {
GoodsParam goodsParam = goodsParamList.get(i);
+ goodsParam.setId(null);
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
goodsParam.setIsdeleted(Constants.ZERO);
@@ -646,6 +648,7 @@
queryWrapper.leftJoin(Category.class, Category::getId, Goods::getCategoryId);
queryWrapper.leftJoin(Brand.class, Brand::getId, Goods::getBrandId);
queryWrapper.eq(Goods::getStatus,Constants.ZERO);
+ queryWrapper.eq(Goods::getCompanyId, goods.getCompanyId());
queryWrapper.eq(Goods::getIsdeleted,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(goods.getAttrFirstIds()),Goods::getAttrFirstIds,goods.getAttrFirstIds());
queryWrapper.like(StringUtils.isNotBlank(goods.getAttrFirstNames()),Goods::getAttrFirstNames,goods.getAttrFirstNames());
@@ -656,7 +659,8 @@
queryWrapper.between(!Objects.isNull(goods.getSPrice())&&!Objects.isNull(goods.getEPrice()),
Goods::getPrice,goods.getSPrice(),goods.getEPrice());
queryWrapper.orderByDesc(Goods::getId);
- List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
+ List<Goods> goodsList = this.goodsMapper.selectListByCollection(goods);
+ // List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
if(!Objects.isNull(goodsList)&&goodsList.size()>Constants.ZERO){
this.dealGoodsMsg(goodsList);
}
@@ -793,8 +797,8 @@
if(brand == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(num)+"銆戣鍟嗗搧鍝佺墝鏃犳晥锛岃妫�鏌ヨ緭鍏ワ紒");
}
- if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("ISDELETED",Constants.ZERO).eq("name",m.getName()))>0){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(num)+"銆戣銆�"+m.getName()+"銆戝凡瀛樺湪");
+ if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("COMPANY_ID",user.getCompanyId()).eq("ISDELETED",Constants.ZERO).eq("name",m.getName()))>0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绗��"+(num)+"銆戣銆�"+m.getName()+"銆戝凡瀛樺湪");
}
Goods newModel = new Goods();
newModel.setRemark(m.getId());
--
Gitblit v1.9.3