diff --git a/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java b/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java index 381d5b5..37f3f5d 100644 --- a/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/VipDetailsController.java @@ -1,5 +1,6 @@ package com.sqx.modules.app.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; @@ -7,6 +8,7 @@ import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.app.service.VipDetailsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -45,4 +47,14 @@ public class VipDetailsController { return Result.success().put("data",new PageUtils(vipDetailsService.page(new Page<>(page,limit)))); } + @ApiParam("查询会员列表") + @GetMapping("/selectVipDetailsListByType") + public Result selectVipDetailsListByType(Integer page,Integer limit,String type) { + QueryWrapper queryWrapper = new QueryWrapper(); + if(StringUtils.isNotBlank(type)){ + queryWrapper.eq("vip_type",type);//0会员 1技师 + } + return Result.success().put("data",new PageUtils(vipDetailsService.page(new Page<>(page,limit),queryWrapper))); + } + } diff --git a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java index 7cf05a4..e39dc7c 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java @@ -129,6 +129,10 @@ public class Artificer implements Serializable { private BigDecimal rate; + private Integer technicianType; + private Integer isStart; + + /** * 1可服务 2可预约 3休息中 */