From f87242a9295535fa42933b8a7e2c419e9ab09ae1 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Mon, 27 Oct 2025 17:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=80=BB=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=93=E7=83=8A=E5=BA=97=E9=93=BA=E9=99=90=E5=88=B6?= =?UTF-8?q?=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/dto/StoreBizTimeInfoDTO.java | 1 + .../impl/ShopOrderBaseServiceImpl.java | 5 +++-- .../store/mapper/ShopStoreBaseMapper.java | 4 ++-- .../store/service/ShopStoreBaseService.java | 2 +- .../impl/ShopStoreBaseServiceImpl.java | 22 ++++++++++++------- .../service/impl/ShopUserCartServiceImpl.java | 6 +++-- 6 files changed, 25 insertions(+), 15 deletions(-) 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 index 9c672df3..27239f7a 100644 --- 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 @@ -22,6 +22,7 @@ import java.io.Serializable; */ public class StoreBizTimeInfoDTO implements Serializable { private Integer store_id; + private String store_name; 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 26448ec7..78991b42 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 @@ -6318,8 +6318,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl storeBizState = shopStoreBaseService.getStoreBizState(currStoreId); + if (storeBizState != null && CommonConstant.Disable2.equals(storeBizState.getFirst())) { + throw new ApiException(I18nUtil._(storeBizState.getSecond() + "，无法提交订单。")); } // 每个订单记录的商品列表 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 9cd6a493..1a41b02c 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 @@ -47,8 +47,8 @@ public interface ShopStoreBaseMapper extends BaseMapper { * @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 " + + @Select("SELECT ssb.store_id, ssb.store_name, ssb.store_biz_state, ssi.store_opening_hours, ssi.store_close_hours " + + " FROM shop_store_base ssb LEFT 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 f48fc7d5..31a5b2ec 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 @@ -243,7 +243,7 @@ public interface ShopStoreBaseService extends IBaseService { * @param storeId * @return */ - Integer getStoreBizState(Integer storeId); + Pair 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 03e5105c..b0d188f8 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 @@ -4239,18 +4239,19 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl getStoreBizState(Integer storeId) { // 参数校验 if (CheckUtil.isEmpty(storeId)) { log.warn("店铺ID为空，无法确定营业状态"); - return CommonConstant.Disable2; + return Pair.of(CommonConstant.Disable2, "店铺营业状态有误"); } try { StoreBizTimeInfoDTO storeBizTimeInfo = baseMapper.getStoreBizTimeInfo(storeId); if (storeBizTimeInfo == null) { log.warn("未找到店铺营业时间信息，storeId: {}", storeId); - return CommonConstant.Disable2; + return Pair.of(CommonConstant.Disable2, "店铺营业状态有误"); } Integer storeBizState = storeBizTimeInfo.getStore_biz_state(); @@ -4266,20 +4267,25 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl storeBizState = shopStoreBaseService.getStoreBizState(storeId); + if (storeBizState != null && CommonConstant.Disable2.equals(storeBizState.getFirst())) { + throw new ApiException(I18nUtil._(storeBizState.getSecond() + "，无法加购商品。")); } Integer cart_type = Convert.toInt(data.get("cart_type"));