From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +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 | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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..b997c44 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,18 +3,16 @@
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;
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;
@@ -48,6 +46,7 @@
@Resource
private ShopService shopService;
+
@Resource
private ShopCertificateService shopCertificateService;
@@ -124,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);
}
@@ -223,10 +222,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 +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.getId());
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
@@ -286,4 +295,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