From 5da53ab90d6152de28b8475cd9ccaa00abba45e8 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Thu, 26 Jun 2025 22:45:18 +0800
Subject: [PATCH] fix: 优化店铺添加，预检查店铺名称，返回添加的店铺信息
---
oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCreateServiceImpl.java | 5 +++--
oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java | 9 ++++++---
oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java | 22 +++++++++++++++++++---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java | 3 +--
oying-system/src/main/java/com/oying/modules/pc/store/service/StoreCreateService.java | 3 ++-
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java | 3 +--
6 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
index a81be6f..552f567 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java
@@ -57,8 +57,7 @@
@PostMapping
@ApiOperation("创建店铺")
public ResponseEntity<?> create(@RequestBody StoreCreateRequest request) {
- storeService.create(request);
- return ResponseEntity.status(HttpStatus.CREATED).build();
+ return ResponseEntity.status(HttpStatus.CREATED).body(R.success(storeService.create(request)));
}
@PostMapping(value = "/{storeId}")
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
index d1852b3..1c19479 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java
@@ -93,8 +93,7 @@
@ApiOperation("创建店铺")
//@PreAuthorize("@el.check('merchant:store:create')")
public ResponseEntity<?> create(@RequestBody StoreCreateRequest request) {
- storeCreateService.create(request);
- return ResponseEntity.status(HttpStatus.CREATED).build();
+ return ResponseEntity.status(HttpStatus.CREATED).body(storeCreateService.create(request));
}
/**
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreCreateService.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreCreateService.java
index 7644c48..80ad44d 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreCreateService.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreCreateService.java
@@ -1,7 +1,8 @@
package com.oying.modules.pc.store.service;
+import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.domain.dto.StoreCreateRequest;
public interface StoreCreateService {
- void create(StoreCreateRequest request);
+ Store create(StoreCreateRequest request);
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
index d56cbfc..f1c3e56 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.pc.store.domain.Store;
-import com.oying.modules.pc.store.domain.StoreCategory;
-import com.oying.modules.pc.store.domain.dto.*;
+import com.oying.modules.pc.store.domain.dto.StoreCreateRequest;
+import com.oying.modules.pc.store.domain.dto.StoreQueryCriteria;
+import com.oying.modules.pc.store.domain.dto.StoreUpdateRequest;
import com.oying.utils.PageResult;
import java.math.BigDecimal;
@@ -26,7 +27,7 @@
List<Store> queryUserStores(Long userId);
- boolean create(StoreCreateRequest request);
+ Store create(StoreCreateRequest request);
boolean update(StoreUpdateRequest request);
@@ -55,4 +56,6 @@
boolean updateStatus(Long storeId, Integer status, Long version);
boolean existsByIdAndMerchantId(Long storeId, Long merchantId);
+
+ boolean existsStoreName(String storeName);
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCreateServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCreateServiceImpl.java
index 9ed3aa1..a2f9b79 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCreateServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCreateServiceImpl.java
@@ -1,5 +1,6 @@
package com.oying.modules.pc.store.service.impl;
+import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.store.domain.dto.StoreCreateRequest;
import com.oying.modules.pc.store.service.StoreCreateService;
import com.oying.modules.pc.store.service.StoreService;
@@ -16,7 +17,7 @@
private final StoreService storeService;
@Transactional(rollbackFor = Exception.class)
- public void create(StoreCreateRequest request) {
- storeService.create(request);
+ public Store create(StoreCreateRequest request) {
+ return storeService.create(request);
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
index f7fbfb4..8531306 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.exception.EntityExistException;
+import com.oying.exception.BadRequestException;
import com.oying.exception.EntityNotFoundException;
import com.oying.modules.pc.common.ValueUpdate;
import com.oying.modules.pc.store.converter.StoreAssembler;
@@ -27,6 +27,7 @@
import com.oying.utils.PageResult;
import com.oying.utils.PageUtil;
import com.oying.utils.SecurityUtils;
+import com.oying.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -79,12 +80,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean create(StoreCreateRequest request) {
+ public Store create(StoreCreateRequest request) {
+ // 检查店铺名称是否存在
+ if (this.existsStoreName(request.getStoreName())) {
+ throw new BadRequestException("店铺名称已存在");
+ }
+ // 创建店铺
Store store = StoreAssembler.to(request);
storeMapper.insert(store);
this.processQualificationCreate(store, request.getQualificationList());
this.bindUser(store.getStoreId());
- return true;
+ return store;
}
@Override
@@ -198,6 +204,16 @@
}
@Override
+ public boolean existsStoreName(String storeName) {
+ if (StringUtils.isEmpty(storeName)) {
+ return true;
+ }
+ LambdaQueryWrapper<Store> wrapper = new LambdaQueryWrapper<Store>()
+ .eq(Store::getStoreName, storeName);
+ return storeMapper.selectCount(wrapper) > 0;
+ }
+
+ @Override
public boolean existsByIdAndMerchantId(Long storeId, Long merchantId) {
if (storeId == null || merchantId == null) {
return false;
--
Gitblit v1.9.3