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/store/service/impl/StoreAuditServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreAuditServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreAuditServiceImpl.java
index 3411955..a4cc8c5 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreAuditServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreAuditServiceImpl.java
@@ -1,5 +1,6 @@
package com.oying.modules.pc.store.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,9 +11,8 @@
import com.oying.modules.pc.store.events.StoreAuditVerdictEvent;
import com.oying.modules.pc.store.mapper.StoreAuditMapper;
import com.oying.modules.pc.store.service.StoreAuditService;
-import com.oying.utils.FileUtil;
-import com.oying.utils.PageResult;
-import com.oying.utils.PageUtil;
+import com.oying.modules.pc.store.view.StoreAuditView;
+import com.oying.utils.*;
import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
@@ -20,10 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author lzp
@@ -39,12 +36,12 @@
private final StoreAuditMapper storeAuditMapper;
@Override
- public PageResult<StoreAudit> queryAll(StoreAuditQueryCriteria criteria, Page<Object> page) {
+ public PageResult<StoreAuditView> queryAll(StoreAuditQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(storeAuditMapper.findAll(criteria, page));
}
@Override
- public List<StoreAudit> queryAll(StoreAuditQueryCriteria criteria) {
+ public List<StoreAuditView> queryAll(StoreAuditQueryCriteria criteria) {
return storeAuditMapper.findAll(criteria);
}
@@ -91,6 +88,8 @@
throw new BadRequestException("审核状态错误");
}
existingAudit.copy(resources);
+ existingAudit.setAuditor(SecurityUtils.getCurrentUsername());
+ existingAudit.setAuditTime(new Date());
storeAuditMapper.updateById(existingAudit);
eventPublisher.publishEvent(new StoreAuditVerdictEvent(existingAudit.getAuditId()));
}
--
Gitblit v1.9.3