Merge branch 'release_lutong_bug' into release_20260123

alien-store/src/main/java/shop/alien/store/service/impl/StoreRenovationBrowseRecordServiceImpl.java

@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import shop.alien.entity.store.StoreInfo;
 import shop.alien.entity.store.StoreRenovationBrowseRecord;
 import shop.alien.entity.store.StoreRenovationRequirement;
 import shop.alien.entity.store.StoreUser;
@@ -20,11 +19,7 @@ import shop.alien.store.service.StoreRenovationBrowseRecordService;
 import shop.alien.store.service.StoreRenovationRequirementService;
 import shop.alien.util.common.JwtUtil;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -209,14 +204,14 @@ public class StoreRenovationBrowseRecordServiceImpl extends ServiceImpl<StoreRen
             }
             Integer renovationStoreId = renovationStoreUser.getStoreId();
 
-            LambdaQueryWrapper<StoreInfo> normalStoreWrapper = new LambdaQueryWrapper<>();
-            normalStoreWrapper.eq(StoreInfo::getStoreTel, normalStoreTel);
-            normalStoreWrapper.eq(StoreInfo::getDeleteFlag, 0);
-            StoreInfo normalStoreInfo = storeInfoMapper.selectOne(normalStoreWrapper);
-            if (normalStoreInfo == null) {
+            // 1. 通过手机号查询门店ID
+            LambdaQueryWrapper<StoreUser> normalStoreUserWrapper = new LambdaQueryWrapper<>();
+            normalStoreUserWrapper.eq(StoreUser::getPhone, normalStoreTel);
+            StoreUser normalStoreUser = storeUserMapper.selectOne(normalStoreUserWrapper);
+            if (normalStoreUser == null || normalStoreUser.getStoreId() == null) {
                 throw new RuntimeException("普通商铺不存在，门店电话: " + normalStoreTel);
             }
-            Integer normalStoreId = normalStoreInfo.getId();
+            Integer normalStoreId = normalStoreUser.getStoreId();
 
             // 1. 查询普通商铺发布的所有装修需求ID
             LambdaQueryWrapper<StoreRenovationRequirement> requirementWrapper = new LambdaQueryWrapper<>();