Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

7 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 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,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());
@@ -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({