From 4507dc1529562a2ab851d25a024fd8db4db9eb3d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 23 Sep 2025 14:52:00 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/service/ProductAuditService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/service/ProductAuditService.java b/oying-system/src/main/java/com/oying/modules/pc/product/service/ProductAuditService.java
index 66ce99d..7929629 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/service/ProductAuditService.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/service/ProductAuditService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.pc.product.domain.ProductAudit;
import com.oying.modules.pc.product.domain.dto.ProductAuditQueryCriteria;
+import com.oying.modules.pc.product.view.ProductAuditView;
import com.oying.utils.PageResult;
import javax.servlet.http.HttpServletResponse;
@@ -24,7 +25,7 @@
* @param page 分页参数
* @return PageResult
*/
- PageResult<ProductAudit> queryAll(ProductAuditQueryCriteria criteria, Page<Object> page);
+ PageResult<ProductAuditView> queryAll(ProductAuditQueryCriteria criteria, Page<Object> page);
/**
* 查询所有数据不分页
@@ -32,7 +33,7 @@
* @param criteria 条件参数
* @return List<StoreRevisionDto>
*/
- List<ProductAudit> queryAll(ProductAuditQueryCriteria criteria);
+ List<ProductAuditView> queryAll(ProductAuditQueryCriteria criteria);
/**
* 商品ID查询修订数据，
@@ -43,6 +44,14 @@
ProductAudit getByProductId(Long productId);
/**
+ * 是否有待审记录
+ *
+ * @param productId 必须的参数，不能为null
+ * @return 查询到的结果
+ */
+ boolean hasPendingByStoreId(Long productId);
+
+ /**
* 创建
*
* @param resources /
--
Gitblit v1.9.3