From 728466c4924c04dc162811f34086855c51ec0878 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 29 Aug 2025 14:30:23 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductAuditServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductAuditServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductAuditServiceImpl.java
index 6713397..d55c18b 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductAuditServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductAuditServiceImpl.java
@@ -10,6 +10,8 @@
import com.oying.modules.pc.product.events.ProductAuditVerdictEvent;
import com.oying.modules.pc.product.mapper.ProductAuditMapper;
import com.oying.modules.pc.product.service.ProductAuditService;
+import com.oying.modules.pc.product.view.ProductAuditView;
+import com.oying.modules.pc.store.domain.StoreAudit;
import com.oying.utils.FileUtil;
import com.oying.utils.PageResult;
import com.oying.utils.PageUtil;
@@ -39,12 +41,12 @@
private final ProductAuditMapper productAuditMapper;
@Override
- public PageResult<ProductAudit> queryAll(ProductAuditQueryCriteria criteria, Page<Object> page) {
+ public PageResult<ProductAuditView> queryAll(ProductAuditQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(productAuditMapper.findAll(criteria, page));
}
@Override
- public List<ProductAudit> queryAll(ProductAuditQueryCriteria criteria) {
+ public List<ProductAuditView> queryAll(ProductAuditQueryCriteria criteria) {
return productAuditMapper.findAll(criteria);
}
@@ -56,6 +58,14 @@
}
@Override
+ public boolean hasPendingByStoreId(Long productId) {
+ LambdaQueryWrapper<ProductAudit> wrapper = new LambdaQueryWrapper<ProductAudit>()
+ .eq(ProductAudit::getProductId, productId)
+ .eq(ProductAudit::getStatus, AuditStatusEnum.PENDING.getValue());
+ return productAuditMapper.selectCount(wrapper) > 0;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void create(ProductAudit resources) {
productAuditMapper.insert(resources);
--
Gitblit v1.9.3