From 548bead175143ab846aaf0816f2ff1129050e94a Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 21 Jul 2025 16:20:40 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java | 4 +++-
oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml | 2 +-
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java | 2 ++
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
index 000ecca..0e2ec45 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
+import com.oying.modules.pc.product.domain.enums.ProductStatusEnum;
import com.oying.modules.pc.product.service.ProductImageService;
import com.oying.modules.pc.product.service.ProductLabelService;
import com.oying.modules.pc.product.service.ProductService;
@@ -54,6 +55,7 @@
criteria.setCategoryId(categoryId);
criteria.setSecondCategoryId(secondCategoryId);
criteria.setBlurry(blurry);
+ criteria.setShelfStatus(ProductStatusEnum.AVAILABLE.getValue());
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<Product> productPageResult = productService.queryAll(criteria, page);
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
index b98c44f..bfcf1c1 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
@@ -77,7 +77,7 @@
private List<Product> getProductsByStoreId(Long storeId) {
ProductQueryCriteria criteria = new ProductQueryCriteria();
criteria.setStoreId(storeId);
- criteria.setStatus(ProductStatusEnum.AVAILABLE.getValue());
+ criteria.setShelfStatus(ProductStatusEnum.AVAILABLE.getValue());
criteria.setLimit(3);
return productService.queryAll(criteria);
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
index 1915403..121e5a4 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
@@ -112,7 +112,9 @@
if (StoreStatusEnum.OPEN.equals(businessStatus) && !AuditStatusEnum.APPROVED.equals(existingStatus)) {
throw new BadRequestException("店铺未审核");
}
- storeService.updateStatus(existingStore.getStoreId(), businessStatus.getValue(), existingStore.getVersion());
+ existingStore.setStatus(businessStatus.getValue());
+ existingStore.setBusinessStatus(businessStatus.getValue());
+ storeService.update(existingStore, true);
}
@Override
diff --git a/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml b/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
index ccbbecf..a70ccfa 100644
--- a/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/store/StoreMapper.xml
@@ -126,7 +126,7 @@
<!-- 店铺名称模糊查询 AND s.name LIKE CONCAT('%', #{criteria.blurry}, '%') -->
<if test="criteria.blurry != null and criteria.blurry != ''">
- AND MATCH(s.store_name) AGAINST(#{criteria.blurry} IN NATURAL LANGUAGE MODE)
+ AND s.store_name like concat('%', #{criteria.blurry}, '%')
</if>
<!-- 营业状态 -->
--
Gitblit v1.9.3