From 6da11b18801f91952d3634ec747385939052c10f Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 13 Jun 2024 16:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/controller/VipDetailsController.java | 12 ++++++++++++
 .../com/sqx/modules/artificer/entity/Artificer.java  |  4 ++++
 2 files changed, 16 insertions(+)

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休息中
      */