Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java

@@ -18,6 +18,20 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.TechnicianDetailVO;
import com.ruoyi.other.vo.TechnicianVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -97,5 +111,22 @@
           }


    /**
     * 指定门店技师列表
     */
    @GetMapping("/technicianListByShopId")
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public R<List<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
        return R.ok(technicianService.getTechnicianListByShopId(shopId));
    }

    /**
     * 技师详情
     */
    @GetMapping("/technicianDetail")
    @ApiOperation(value = "技师详情", tags = {"技师详情-小程序"})
    public R<TechnicianDetailVO> technicianDetail(@ApiParam("技师id") @RequestParam Long technicianId) {
        return R.ok(technicianService.technicianDetail(technicianId));
    }
}