From 452d17b1c16bfe8585c16bd82e67450abd97c82f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:57:25 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 25a399c..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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
@@ -13,8 +14,8 @@
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
@@ -48,6 +49,7 @@
@Resource
private ShopService shopService;
+
@Resource
private ShopCertificateService shopCertificateService;
@@ -223,10 +225,20 @@
@ApiOperation(value = "门店添加不可预约时间段【2.0】")
public R addShopNonAppointableTime(@RequestBody ShopNonAppointableTimeDto dto) {
ShopNonAppointableTime shopNonAppointableTime = new ShopNonAppointableTime();
+ shopNonAppointableTime.setId(IdUtils.simpleUUID());
shopNonAppointableTime.setShopId(dto.getShopId());
shopNonAppointableTime.setNonAppointableStartTime(dto.getNonAppointableStartTime());
shopNonAppointableTime.setNonAppointableEndTime(dto.getNonAppointableEndTime());
shopNonAppointableTimeService.save(shopNonAppointableTime);
+ return R.ok();
+ }
+
+
+
+ @RequestMapping(value = "/delShopNonAppointableTime/{id}", method = RequestMethod.POST)
+ @ApiOperation(value = "门店删除不可预约时间段【2.0】")
+ public R delShopNonAppointableTime(@PathVariable("id") String id) {
+ shopNonAppointableTimeService.removeById(id);
return R.ok();
}
@@ -258,7 +270,7 @@
@RequestMapping(value = "/confirmReservation/{id}", method = RequestMethod.POST)
@ApiOperation(value = "商户确认预约【2.0】")
public R confirmReservation(@PathVariable("id") String id) {
- ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id);
+ TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id);
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
@@ -274,7 +286,7 @@
@RequestMapping(value = "/cancelReservation", method = RequestMethod.POST)
@ApiOperation(value = "商户取消预约【2.0】")
public R cancelReservation(@RequestBody CancelReservationDto dto) {
- ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId());
+ TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId());
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
--
Gitblit v1.7.1