diff --git a/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/StoreBizTimeInfoDTO.java b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/StoreBizTimeInfoDTO.java new file mode 100644 index 00000000..9c672df3 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/StoreBizTimeInfoDTO.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2024. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan. + * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna. + * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus. + * Vestibulum commodo. Ut rhoncus gravida arcu. + */ + +package com.suisung.mall.common.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +/** + * 标准的地址实体类 + */ +public class StoreBizTimeInfoDTO implements Serializable { + private Integer store_id; + private Integer store_biz_state; + private String store_opening_hours; + private String store_close_hours; +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 6581e3ed..26448ec7 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -1674,7 +1674,6 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl item_items = (List) store_item.get("items"); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreBaseMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreBaseMapper.java index 37768251..9cd6a493 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreBaseMapper.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStoreBaseMapper.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.modules.store.ShopStoreBase; +import com.suisung.mall.common.pojo.dto.StoreBizTimeInfoDTO; import io.lettuce.core.dynamic.annotation.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.util.List; @@ -31,10 +33,23 @@ public interface ShopStoreBaseMapper extends BaseMapper { /** * 搜索附近店铺,排序:从近到远 2024-12-26 + * * @param page * @param params 省份province_id、城市city_id、县county_id、店铺分类store_category_id、分店subsite_id,店铺名称关键字store_name、 * @return */ IPage getNearShop2(Page page, @Param("params") Map params); + + /** + * 获取店铺营业时间信息 + * + * @param storeId + * @return + */ + @Select("SELECT ssb.store_id, ssb.store_biz_state, ssi.store_opening_hours, ssi.store_close_hours " + + " LEFT FROM shop_store_base ssb JOIN shop_store_info ssi ON ssb.store_id = ssi.store_id " + + " WHERE ssb.store_id = #{storeId} LIMIT 1") + StoreBizTimeInfoDTO getStoreBizTimeInfo(@Param("storeId") Integer storeId); + } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java index dbfd8ef3..f48fc7d5 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java @@ -237,6 +237,14 @@ public interface ShopStoreBaseService extends IBaseService { */ Integer getStoreBizState(ShopStoreBase shopStoreBase, ShopStoreInfo shopStoreInfo); + /** + * 根据店铺Id获取店铺营业状态 + * + * @param storeId + * @return + */ + Integer getStoreBizState(Integer storeId); + // Page getMobileStoreList(Integer page, Integer rows); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java index 4a530238..03e5105c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java @@ -44,6 +44,7 @@ import com.suisung.mall.common.modules.store.*; import com.suisung.mall.common.modules.user.ShopUserFavoritesStore; import com.suisung.mall.common.pojo.dto.GpsDTO; import com.suisung.mall.common.pojo.dto.StandardAddressDTO; +import com.suisung.mall.common.pojo.dto.StoreBizTimeInfoDTO; import com.suisung.mall.common.service.impl.BaiduMapServiceImpl; import com.suisung.mall.common.utils.*; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; @@ -4200,38 +4201,89 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl