优化布局

2026-07-24 13:26:37 +08:00
parent bca1335dc6
commit f1b7a7aae8
8 changed files with 192 additions and 43 deletions
@@ -1,6 +1,7 @@
 package com.nanri.aiimage.modules.ziniao.service;

 import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.modules.shopkey.service.ShopManageService;
 import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -11,9 +12,10 @@ public class ZiniaoShopSwitchService {

    private final ZiniaoAuthService ziniaoAuthService;
    private final ZiniaoShopIndexService ziniaoShopIndexService;
+    private final ShopManageService shopManageService;

    public ZiniaoShopMatchResultVo matchStoreByNameAcrossStaff(String targetShopName, Long preferUserId) {
-        String normalizedShopName = normalizeShopName(targetShopName);
+        String normalizedShopName = requireManagedShopName(targetShopName);
        if (normalizedShopName.isBlank()) {
            return emptyMatchResult();
        }
@@ -31,11 +33,15 @@ public class ZiniaoShopSwitchService {
    }

    public ZiniaoShopMatchResultVo findIndexedStoreByName(String targetShopName) {
-        return ziniaoShopIndexService.findIndexedStoreByName(targetShopName);
+        return findIndexedStoreByName(targetShopName, true);
    }

    public ZiniaoShopMatchResultVo findIndexedStoreByName(String targetShopName, boolean buildOpenStoreUrl) {
-        return ziniaoShopIndexService.findIndexedStoreByName(targetShopName, buildOpenStoreUrl);
+        String normalizedShopName = requireManagedShopName(targetShopName);
+        if (normalizedShopName.isBlank()) {
+            return emptyMatchResult();
+        }
+        return ziniaoShopIndexService.findIndexedStoreByName(normalizedShopName, buildOpenStoreUrl);
    }

    public ZiniaoShopMatchResultVo emptyMatchResult() {
@@ -53,6 +59,14 @@ public class ZiniaoShopSwitchService {
        return value.replace("　", " ").trim();
    }

+    private String requireManagedShopName(String targetShopName) {
+        String normalizedShopName = normalizeShopName(targetShopName);
+        if (!normalizedShopName.isBlank()) {
+            shopManageService.requireShopByName(normalizedShopName);
+        }
+        return normalizedShopName;
+    }
+
    public boolean isSkippableMatchError(BusinessException ex) {
        String message = ex == null ? null : ex.getMessage();
        if (message == null || message.isBlank()) {