From a95d0c4bdd96b09342c7ccf9aa1aef4b26b31302 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 14:17:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 19c74a2..120d96a 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
@@ -9,13 +9,10 @@
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.dto.*;
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;
@@ -28,7 +25,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;
/**
@@ -123,9 +123,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "当前商户id", name = "shopId", required = true, dataType = "Long", paramType = "query")
})
- public R<MerStaffInfoVo> getShopStaffInfo(@RequestParam("shopId") Long shopId) {
+ public R<MerStaffInfoVo> getShopStaffInfo(@RequestBody ShopStaffInfoDto dto) {
Long userId = SecurityUtils.getUserId();
- Shop shop = shopService.getByShopId(shopId);
+ Shop shop = shopService.getByShopId(dto.getShopId());
MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId, shop);
return R.ok(merStaffInfoVo);
}
@@ -231,6 +231,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({
@@ -258,7 +267,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 +283,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.getAppointmentId());
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
@@ -282,7 +291,7 @@
return R.fail("不能重复操作");
}
shopAppointableTime.setStatus(0);
- shopAppointableTime.setReason(dto.getReason());
+ shopAppointableTime.setReason(dto.getCancelReason());
shopAppointableTimeService.updateById(shopAppointableTime);
return R.ok();
}
@@ -294,6 +303,9 @@
List<ShopRelUser> shopRelUser = shopRelUserService.getByUserId(userId);
List<Shop> collect = shopRelUser.stream().map(e -> {
Shop shop = shopService.getById(e.getShopId());
+ if (e.getIsDefault()==1){
+ shop.setIsDefault(true);
+ }
return shop;
}).collect(Collectors.toList());
return R.ok(collect);
--
Gitblit v1.7.1