用户端 详情 列表 营业时间回显

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -181,6 +181,9 @@ public class StoreInfoVo extends StoreInfo {
     private StoreBusinessInfo storeBusinessInfo;
     private List<StoreBusinessInfo> storeBusinessInfos;
 
+    @ApiModelProperty(value = "门店营业时间列表（包含节假日信息）")
+    private List<StoreBusinessInfoVo> storeBusinessInfoVos;
+
     @ApiModelProperty(value = "是否营业中(0否1是)")
     private Integer yyFlag;
 

alien-store/src/main/java/shop/alien/store/controller/AiSearchController.java

@@ -23,6 +23,7 @@ import org.springframework.web.client.RestTemplate;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.StoreBannerVo;
+import shop.alien.entity.store.vo.StoreBusinessInfoVo;
 import shop.alien.entity.store.vo.StoreBusinessStatusVo;
 import shop.alien.entity.store.vo.StoreInfoVo;
 import shop.alien.mapper.*;
@@ -389,7 +390,7 @@ public class AiSearchController {
 
     /**
      * 批量填充营业时间到StoreInfoVo列表中
-     * 通过调用storeInfoService.getStoreBusinessStatus方法获取营业时间
+     * 通过调用storeInfoService.getStoreInfoBusinessHours方法获取营业时间（包含节假日信息）
      *
      * @param result StoreInfoVo列表
      */
@@ -398,32 +399,38 @@ public class AiSearchController {
             return;
         }
 
-        // 遍历result集合，为每个门店调用getStoreBusinessStatus方法
+        // 遍历result集合，为每个门店调用getStoreInfoBusinessHours方法
         for (StoreInfoVo storeInfo : result) {
             if (storeInfo.getId() != null) {
                 try {
-                    // 调用getStoreBusinessStatus方法获取营业时间
-                    StoreBusinessStatusVo businessStatus = storeInfoService.getStoreBusinessStatus(String.valueOf(storeInfo.getId()));
-                    if (businessStatus != null) {
-                        // 设置营业时间信息到StoreInfoVo中
-                        if (businessStatus.getStoreBusinessInfos() != null && !businessStatus.getStoreBusinessInfos().isEmpty()) {
-                            storeInfo.setStoreBusinessInfos(businessStatus.getStoreBusinessInfos());
-                            // 同时设置到openTime字段（格式化为字符串列表）
-                            List<String> openTimeList = businessStatus.getStoreBusinessInfos().stream()
-                                    .map(info -> {
-                                        if (info.getBusinessDate() != null && info.getStartTime() != null && info.getEndTime() != null) {
-                                            return info.getBusinessDate() + " " + info.getStartTime() + "-" + info.getEndTime();
-                                        }
-                                        return null;
-                                    })
-                                    .filter(time -> time != null)
-                                    .collect(Collectors.toList());
-                            storeInfo.setOpenTime(openTimeList);
-                        }
-                        // 设置营业状态
-                        if (businessStatus.getYyFlag() != null) {
-                            storeInfo.setYyFlag(businessStatus.getYyFlag());
+                    // 调用getStoreInfoBusinessHours方法获取营业时间（包含节假日信息）
+                    List<StoreBusinessInfoVo> storeBusinessInfoVos = storeInfoService.getStoreInfoBusinessHours(storeInfo.getId());
+                    if (storeBusinessInfoVos != null && !storeBusinessInfoVos.isEmpty()) {
+                        // 设置包含节假日信息的营业时间列表
+                        storeInfo.setStoreBusinessInfoVos(storeBusinessInfoVos);
+                        // 转换为 List<StoreBusinessInfo> 用于兼容原有字段（StoreBusinessInfoVo 继承自 StoreBusinessInfo）
+                        List<StoreBusinessInfo> storeBusinessInfos = new ArrayList<>(storeBusinessInfoVos);
+                        storeInfo.setStoreBusinessInfos(storeBusinessInfos);
+                        // 设置第一个营业时间信息到 storeBusinessInfo 字段
+                        if (!storeBusinessInfos.isEmpty()) {
+                            storeInfo.setStoreBusinessInfo(storeBusinessInfos.get(0));
                         }
+                        // 同时设置到openTime字段（格式化为字符串列表）
+                        List<String> openTimeList = storeBusinessInfoVos.stream()
+                                .map(info -> {
+                                    if (info.getBusinessDate() != null && info.getStartTime() != null && info.getEndTime() != null) {
+                                        return info.getBusinessDate() + " " + info.getStartTime() + "-" + info.getEndTime();
+                                    }
+                                    return null;
+                                })
+                                .filter(time -> time != null)
+                                .collect(Collectors.toList());
+                        storeInfo.setOpenTime(openTimeList);
+                    }
+                    // 获取营业状态（通过getStoreBusinessStatus方法）
+                    StoreBusinessStatusVo businessStatus = storeInfoService.getStoreBusinessStatus(String.valueOf(storeInfo.getId()));
+                    if (businessStatus != null && businessStatus.getYyFlag() != null) {
+                        storeInfo.setYyFlag(businessStatus.getYyFlag());
                     }
                 } catch (Exception e) {
                     log.error("获取门店营业时间失败，storeId: {}", storeInfo.getId(), e);

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

@@ -6072,13 +6072,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
 //        // 获取店铺动态总数
 //        result.setTotalDynamicsNum(storeDynamicslist.size());
 
-        //营业时间
-        List<StoreBusinessInfo> storeBusinessInfos = storeBusinessInfoMapper.selectList(
-                new LambdaQueryWrapper<StoreBusinessInfo>()
-                        .eq(StoreBusinessInfo::getStoreId, storeId)
-                        .eq(StoreBusinessInfo::getDeleteFlag, 0)
-        );
-        // 回显所有营业时间信息（特殊营业时间和正常营业时间）
+        //营业时间（通过 getStoreInfoBusinessHours 方法获取，包含节假日信息）
+        List<StoreBusinessInfoVo> storeBusinessInfoVos = this.getStoreInfoBusinessHours(Integer.parseInt(storeId));
+        // 设置包含节假日信息的营业时间列表
+        result.setStoreBusinessInfoVos(storeBusinessInfoVos);
+        // 转换为 List<StoreBusinessInfo> 用于后续判断（StoreBusinessInfoVo 继承自 StoreBusinessInfo）
+        List<StoreBusinessInfo> storeBusinessInfos = new ArrayList<>(storeBusinessInfoVos);
+        // 回显所有营业时间信息（特殊营业时间和正常营业时间，包含节假日信息）
         if (ObjectUtils.isNotEmpty(storeBusinessInfos)) {
             result.setStoreBusinessInfo(storeBusinessInfos.get(0));
             result.setStoreBusinessInfos(storeBusinessInfos);