From 57c69219eb101c5ecc577a77882febf0cded1aed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 30 六月 2025 11:02:18 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 9b5aaf7..19c74a2 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;
@@ -27,10 +28,7 @@
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -48,6 +46,7 @@
@Resource
private ShopService shopService;
+
@Resource
private ShopCertificateService shopCertificateService;
@@ -223,6 +222,7 @@
@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());
@@ -286,4 +286,18 @@
shopAppointableTimeService.updateById(shopAppointableTime);
return R.ok();
}
+
+ @RequestMapping(value = "/getMyShopList", method = RequestMethod.POST)
+ @ApiOperation(value = "获取当前账户可切换的门店列表【2.0】")
+ public R<List<Shop>> getMyShopList() {
+ Long userId = SecurityUtils.getUserId();
+ List<ShopRelUser> shopRelUser = shopRelUserService.getByUserId(userId);
+ List<Shop> collect = shopRelUser.stream().map(e -> {
+ Shop shop = shopService.getById(e.getShopId());
+ return shop;
+ }).collect(Collectors.toList());
+ return R.ok(collect);
+ }
+
+
}
--
Gitblit v1.7.1