From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQueryCriteria.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQueryCriteria.java
index ad86796..0009d3a 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreQueryCriteria.java
@@ -1,8 +1,7 @@
package com.oying.modules.pc.store.domain.dto;
-import com.oying.utils.StringUtils;
-import lombok.Data;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.springframework.util.DigestUtils;
import java.io.Serializable;
@@ -18,13 +17,15 @@
@ApiModelProperty(value = "商户ID", example = "1")
private Long merchantId;
+ private Long storeId;
+
+ private Long platformCategoryId;
+
private String storeName;
private Integer status;
- private Long storeId;
-
- private Long platformCategoryId;
+ private Integer businessStatus;
private String blurry;
@@ -32,7 +33,7 @@
private Double latitude; // 中心点纬度
- private Integer radius = 10000; // 搜索半径(米)
+ private Integer radius = 50000000; // 搜索半径(米)
private Integer limit = 20; // 返回数量限制
@@ -44,19 +45,16 @@
public String buildConditionCacheKey() {
StringJoiner baseKeyJoiner = new StringJoiner("|");
- if (platformCategoryId != null) {
- baseKeyJoiner.add("platformCategoryId=" + platformCategoryId);
- }
- if (StringUtils.isNotEmpty(blurry)) {
- baseKeyJoiner.add("blurry=" + blurry);
- }
- if (longitude != null && latitude != null) {
- baseKeyJoiner.add("longitude=" + longitude);
- baseKeyJoiner.add("latitude=" + latitude);
- }
- if (StringUtils.isNotEmpty(blurry)) {
- baseKeyJoiner.add("radius=" + radius);
- }
+ baseKeyJoiner.add("merchantId=" + merchantId);
+ baseKeyJoiner.add("storeId=" + storeId);
+ baseKeyJoiner.add("platformCategoryId=" + platformCategoryId);
+ baseKeyJoiner.add("storeName=" + storeName);
+ baseKeyJoiner.add("status=" + status);
+ baseKeyJoiner.add("businessStatus=" + businessStatus);
+ baseKeyJoiner.add("blurry=" + blurry);
+ baseKeyJoiner.add("longitude=" + longitude);
+ baseKeyJoiner.add("latitude=" + latitude);
+ baseKeyJoiner.add("radius=" + radius);
// 使用MD5或SHA缩短键长度
return "store:search:page:" + DigestUtils.md5DigestAsHex(baseKeyJoiner.toString().getBytes());
}
--
Gitblit v1.9.3