czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

图库需求

This commit is contained in:
Tankaikai 2025-02-26 17:49:23 +08:00
parent 813672656d
commit 81ea44bfed
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.czg.account.service.PictureClassifyService;
import com.czg.enums.DeleteEnum; import com.czg.enums.DeleteEnum;
import com.czg.enums.YesNoEnum; import com.czg.enums.YesNoEnum;
import com.czg.exception.CzgException; import com.czg.exception.CzgException;
import com.czg.product.entity.ShopProdUnit;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.account.mapper.PictureClassifyMapper; import com.czg.service.account.mapper.PictureClassifyMapper;
import com.czg.utils.PageUtil; import com.czg.utils.PageUtil;
@ -34,8 +33,12 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
queryWrapper.like(PictureClassify::getName, param.getName()); queryWrapper.like(PictureClassify::getName, param.getName());
} }
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
queryWrapper.eq(PictureClassify::getShopId, shopId); queryWrapper.and(q -> {
queryWrapper.eq(PictureClassify::getIsDel, DeleteEnum.DELETED.value()); q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
});
});
queryWrapper.eq(PictureClassify::getIsDel, DeleteEnum.NORMAL.value());
queryWrapper.orderBy(PictureClassify::getSort, true); queryWrapper.orderBy(PictureClassify::getSort, true);
queryWrapper.orderBy(PictureClassify::getId, false); queryWrapper.orderBy(PictureClassify::getId, false);
return queryWrapper; return queryWrapper;
@ -51,10 +54,9 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
public void addPictureClassify(PictureClassifyDTO dto) { public void addPictureClassify(PictureClassifyDTO dto) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName()) boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName())
.eq(PictureClassify::getShopId, shopId)
.and(q -> { .and(q -> {
q.eq(PictureClassify::getShopId, shopId).or(q1 -> { q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
q1.eq(PictureClassify::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
}); });
}) })
); );
@ -73,11 +75,10 @@ public class PictureClassifyServiceImpl extends ServiceImpl<PictureClassifyMappe
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
dto.setShopId(shopId); dto.setShopId(shopId);
boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName()) boolean exists = super.exists(query().eq(PictureClassify::getName, dto.getName())
.eq(PictureClassify::getShopId, shopId)
.ne(PictureClassify::getId, dto.getId()) .ne(PictureClassify::getId, dto.getId())
.and(q -> { .and(q -> {
q.eq(PictureClassify::getShopId, shopId).or(q1 -> { q.eq(PictureClassify::getShopId, shopId).or(q1 -> {
q1.eq(PictureClassify::getShopId, 0).eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value()); q1.eq(PictureClassify::getShopId, 0).eq(PictureClassify::getIsSystem, YesNoEnum.YES.value());
}); });
}) })
); );