From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 d51a4e4..2f8910d 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,15 +3,13 @@
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.ShopNonAppointableTime;
import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
@@ -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();
}
@@ -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