From 1707827bc8cce931e1f24d440048b889efd141c9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:59:43 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index ee3f022..127c50a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -28,7 +28,10 @@
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -231,6 +234,15 @@
}
+
+ @RequestMapping(value = "/delShopNonAppointableTime/{id}", method = RequestMethod.POST)
+ @ApiOperation(value = "门店删除不可预约时间段【2.0】")
+ public R delShopNonAppointableTime(@PathVariable("id") String id) {
+ shopNonAppointableTimeService.removeById(id);
+ return R.ok();
+ }
+
+
@RequestMapping(value = "/switchAppointment/{shopId}/{subscribe}", method = RequestMethod.POST)
@ApiOperation(value = "开关门店预约配置【2.0】")
@ApiImplicitParams({
--
Gitblit v1.7.1