From 1562e96c5a7721eae2e7504d041e99c595837347 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sun, 27 Apr 2025 17:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=97=B6=E9=97=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E5=90=8C=E6=AD=A5=E9=97=A8=E5=BA=97=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storeshop/StoreShopServiceImpl.java       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/service/storeshop/StoreShopServiceImpl.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/service/storeshop/StoreShopServiceImpl.java
index 850f99d..b8892bb 100644
--- a/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/service/storeshop/StoreShopServiceImpl.java
+++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/service/storeshop/StoreShopServiceImpl.java
@@ -1,6 +1,7 @@
 package co.yixiang.yshop.module.store.service.storeshop;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import co.yixiang.yshop.framework.common.exception.ErrorCode;
 import co.yixiang.yshop.framework.security.core.util.SecurityFrameworkUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,6 +45,8 @@ public class StoreShopServiceImpl implements StoreShopService {
         });
         // 插入
         StoreShopDO shop = StoreShopConvert.INSTANCE.convert(createReqVO);
+        Integer status = doShopStatus(shop.getStartTime(),shop.getEndTime());
+        shop.setStatus(status);
         shopMapper.insert(shop);
         // 返回
         return shop.getId();
@@ -66,9 +69,39 @@ public class StoreShopServiceImpl implements StoreShopService {
         validateShopExists(updateReqVO.getId());
         // 更新
         StoreShopDO updateObj = StoreShopConvert.INSTANCE.convert(updateReqVO);
+        Integer status = doShopStatus(updateObj.getStartTime(),updateObj.getEndTime());
+        updateObj.setStatus(status);
         shopMapper.updateById(updateObj);
     }
 
+
+    /**
+     * 处理营业时间
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    private Integer doShopStatus(Date startTime,Date endTime){
+        Date now = new Date();
+        Integer sH = DateUtil.hour(startTime,true);
+        Integer sM = DateUtil.minute(startTime);
+        Integer eH = DateUtil.hour(endTime,true);
+        Integer eM = DateUtil.minute(endTime);
+        Integer nH = DateUtil.hour(now,true);
+        Integer nM = DateUtil.minute(now);
+        if(nH < sH){
+            return 0;
+        }else if(eH < nH){
+            return 0;
+        }else if(nH == sH && sM > nM){
+            return 0;
+        }else if(eH == nH && eM < nM){
+            return 0;
+        } else{
+            return 1;
+        }
+    }
+
     @Override
     public void deleteShop(Long id) {
         // 校验存在