给接口文档打上中文

project/jiaqingjiayi/sql/sql.sql

@@ -185,3 +185,74 @@ create table if not exists manicurist_auth
 
 ALTER TABLE manicurist ADD COLUMN manStatus INT DEFAULT 0;
 
+-- 预约表
+CREATE TABLE IF NOT EXISTS appointments
+(
+    id              BIGINT AUTO_INCREMENT COMMENT '预约ID' PRIMARY KEY,
+    userId          BIGINT                             NOT NULL COMMENT '用户ID（关联用户表）',
+    userName        VARCHAR(100)                       NOT NULL COMMENT '用户姓名',
+    phone           varchar(64)                        not null comment '手机号',
+    businessId      BIGINT                             NOT NULL COMMENT '商家ID（关联商家表）',
+    manicuristId    BIGINT                                      COMMENT '美甲师ID, 如果为空到店分配',
+    appointmentTime DATETIME                           NOT NULL COMMENT '预约时间',
+    serviceMode     TINYINT                            NOT NULL COMMENT '服务方式（0 - 线上, 1 - 到店）',
+    payMethod       tinyint                            not null comment '支付方式：0微信支付',
+    notes           varchar(128)                       null comment '备注',
+    status          TINYINT  DEFAULT 0                 NOT NULL COMMENT '预约状态（0 - 已确认, 1 - 已完成, 2 - 已取消）',
+    createTime      DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
+    updateTime      DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    isDelete        TINYINT  DEFAULT 0                 NOT NULL COMMENT '是否删除',
+    INDEX idx_userId (userId),
+    INDEX idx_businessId (businessId),
+    INDEX idx_manicuristId (manicuristId)
+) COMMENT '预约表' COLLATE = utf8mb4_unicode_ci;
+
+-- 订单表
+CREATE TABLE IF NOT EXISTS orders
+(
+    id            BIGINT AUTO_INCREMENT COMMENT '订单ID' PRIMARY KEY,
+    orderNumber   VARCHAR(50)                        NOT NULL UNIQUE COMMENT '订单号',
+    userId        BIGINT                             NOT NULL COMMENT '用户ID（关联用户表）',
+    businessId    bigint                             not null comment '商家id',
+    userName      VARCHAR(100)                       NOT NULL COMMENT '用户姓名',
+    phone         varchar(64)                        not null comment '手机号',
+    appointmentId BIGINT                             NULL COMMENT '预约ID（关联预约表）',
+    totalPrice    DECIMAL(10, 2)                     NOT NULL COMMENT '订单总金额',
+    paymentStatus TINYINT  DEFAULT 0                 NOT NULL COMMENT '支付状态（0 - 未支付, 1 - 已支付, 2 - 退款中, 3 - 已退款）',
+    claimStatus   TINYINT  DEFAULT 0                 NOT NULL COMMENT '抢单状态（0 - 未抢单, 1 - 已抢单）',
+    notes         varchar(128)                       null comment '备注',
+    createTime    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
+    updateTime    DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    isDelete      TINYINT  DEFAULT 0                 NOT NULL COMMENT '是否删除',
+    INDEX idx_userId (userId),
+    INDEX idx_appointmentId (appointmentId)
+) COMMENT '订单表' COLLATE = utf8mb4_unicode_ci;
+
+-- 订单详情表
+CREATE TABLE IF NOT EXISTS order_items
+(
+    id             BIGINT AUTO_INCREMENT COMMENT '详细订单ID' PRIMARY KEY,
+    orderId        BIGINT                             NOT NULL COMMENT '订单ID（关联订单表）',
+    commoditiesId  BIGINT                             NOT NULL COMMENT '商品ID（美甲款式）',
+    quantity       INT                                NOT NULL COMMENT '商品数量',
+    price          DECIMAL(10, 2)                     NOT NULL COMMENT '商品单价',
+    subtotal       decimal(10, 2)                     not null comment '小计（单价 * 数量）',
+    attributeNames varchar(512)                       null comment '规格属性列表',
+    createTime     DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间',
+    updateTime     DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    isDelete       TINYINT  DEFAULT 0                 NOT NULL COMMENT '是否删除',
+    INDEX idx_orderId (orderId),
+    INDEX idx_commoditiesId (commoditiesId)
+) COMMENT '详细订单表' COLLATE = utf8mb4_unicode_ci;
+
+-- 抢单记录表
+CREATE TABLE IF NOT EXISTS order_claim
+(
+    id           BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '抢单记录ID',
+    orderId      BIGINT             NOT NULL COMMENT '订单ID（关联订单表）',
+    manicuristId BIGINT             NOT NULL COMMENT '美甲师ID（关联美甲师表）',
+    claimStatus  TINYINT  DEFAULT 0 NOT NULL COMMENT '抢单状态（0 - 待抢单, 1 - 已抢单, 2 - 已分配, 3 - 放弃）',
+    claimTime    DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '抢单时间',
+    INDEX idx_orderId (orderId),
+    INDEX idx_manicuristId (manicuristId)
+) COMMENT '抢单记录表' COLLATE = utf8mb4_unicode_ci;

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/AlipayController.java

@@ -17,6 +17,7 @@ import com.cj.jiaqingjiayi.contant.UserConstant;
 import com.cj.jiaqingjiayi.mapper.UserMapper;
 import com.cj.jiaqingjiayi.model.domain.User;
 import com.cj.jiaqingjiayi.utils.RandomNumberGenerator;
+import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +32,7 @@ import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+@Api(tags = "支付宝接口")
 @RestController
 @RequestMapping("/Alipay")
 public class AlipayController {

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/BusinessController.java

@@ -19,6 +19,8 @@ import com.cj.jiaqingjiayi.model.vo.BusinessVO;
 import com.cj.jiaqingjiayi.service.BusinessAuthService;
 import com.cj.jiaqingjiayi.service.BusinessService;
 import com.cj.jiaqingjiayi.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.DigestUtils;
@@ -35,6 +37,7 @@ import static com.cj.jiaqingjiayi.contant.UserConstant.USER_SALT;
  * 商家接口
  */
 @Slf4j
+@Api(tags = "商家接口")
 @RestController
 @RequestMapping("/business")
 public class BusinessController {
@@ -48,6 +51,7 @@ public class BusinessController {
     @Resource
     private BusinessAuthService businessAuthService;
 
+    @ApiOperation(value = "添加商家")
     @PostMapping("/add")
     public BaseResponse<Long> addBusiness(@RequestBody BusinessAddRequest businessAddRequest) {
         ThrowUtils.throwIf(businessAddRequest == null, ErrorCode.PARAMS_ERROR);
@@ -88,6 +92,7 @@ public class BusinessController {
      * @param businessUpdateRequest
      *  @return
      */
+    @ApiOperation(value = "管理员更新商家")
     @PostMapping("/update")
     public BaseResponse<Boolean> updateBusiness (@RequestBody BusinessUpdateRequest businessUpdateRequest, HttpServletRequest request) {
         //判断是否为管理员
@@ -115,6 +120,7 @@ public class BusinessController {
      * @param id
      * @return
      */
+    @ApiOperation(value = "管理员根据id查询商家")
     @GetMapping("/getById")
     public BaseResponse<BusinessAdminVO> getBusinessById(long id, HttpServletRequest request) {
         //判断是否为管理员
@@ -133,6 +139,7 @@ public class BusinessController {
      * 查询所有商家
      * @return
      */
+    @ApiOperation(value = "查询所有商家")
     @PostMapping("/list")
     public BaseResponse<List<Business>> listBusinessAll(){
         List<Business> businessList = businessService.list();
@@ -145,6 +152,7 @@ public class BusinessController {
      * @param businessQueryRequest
      * @return
      */
+    @ApiOperation(value = "分页查询商家")
     @PostMapping("/list/page")
     //@AuthCheck(mustRole = 1)
     public BaseResponse<Page<Business>> listBusinessByPage (@RequestBody BusinessQueryRequest businessQueryRequest) {
@@ -158,6 +166,7 @@ public class BusinessController {
     /**
      * 分页获取商家列表（用户视图）
      */
+    @ApiOperation(value = "用户分页获取商家")
     @PostMapping("/list/page/vo")
     public BaseResponse<Page<BusinessVO>> listBusinessVOByPage(@RequestBody BusinessQueryRequest businessQueryRequest) {
             long current = businessQueryRequest.getCurrent();
@@ -178,6 +187,7 @@ public class BusinessController {
     }
 
 
+    @ApiOperation(value = "获取当前登录商家")
     @GetMapping("/current")
     public BaseResponse<BusinessVO> getLoginBusiness(HttpServletRequest request){
         //获取登录态

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CartController.java

@@ -16,6 +16,8 @@ import com.cj.jiaqingjiayi.model.request.cart.CartUpdateRequest;
 import com.cj.jiaqingjiayi.model.vo.CartVO;
 import com.cj.jiaqingjiayi.service.CartService;
 import com.cj.jiaqingjiayi.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +35,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
+@Api(tags = "购物车接口")
 @RequestMapping("/cart")
 public class CartController {
 
@@ -48,6 +51,7 @@ public class CartController {
      * @param request 网络请求
      * @return 购物车id
      */
+    @ApiOperation(value = "添加购物车")
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Long> addCart (@RequestBody CartAddRequest cartAddRequest, HttpServletRequest request) {
@@ -68,6 +72,7 @@ public class CartController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "更新购物车")
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> updateCart (@RequestBody CartUpdateRequest cartUpdateRequest, HttpServletRequest request){
@@ -89,6 +94,7 @@ public class CartController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "删除购物车")
     @PostMapping("/delete")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> deleteCart (@RequestBody CartDeleteRequest cartDeleteRequest, HttpServletRequest request) {
@@ -108,6 +114,7 @@ public class CartController {
      * @param request 网络请求
      * @return 脱敏列表
      */
+    @ApiOperation(value = "根据商户id获取购物车脱敏列表")
     @PostMapping("/selectByBusinessId")
     public BaseResponse<List<CartVO>> selectByBusinessId (@RequestBody CartQueryRequest cartQueryRequest, HttpServletRequest request) {
         if (cartQueryRequest == null) {
@@ -130,6 +137,7 @@ public class CartController {
      * @param request 网络请求
      * @return 脱敏列表
      */
+    @ApiOperation(value = "根据用户查找购物车列表")
     @PostMapping("/selectByUserId")
     public BaseResponse<List<CartVO>> selectByUserId (HttpServletRequest request) {
         User loginUser = userService.getLoginUser(request);
@@ -148,6 +156,7 @@ public class CartController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "清空商家内的购物车")
     @PostMapping("/empty/business")
     public BaseResponse<Boolean> emptyBusinessCart(@RequestBody CartQueryRequest cartQueryRequest, HttpServletRequest request) {
         if (cartQueryRequest == null) {
@@ -171,6 +180,7 @@ public class CartController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "清空用户购物车")
     @PostMapping("/empty/user")
     public BaseResponse<Boolean> emptyUserCart(HttpServletRequest request) {
         User loginUser = userService.getLoginUser(request);

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CommoditiesController.java

@@ -22,6 +22,8 @@ import com.cj.jiaqingjiayi.model.vo.LoginUserVO;
 import com.cj.jiaqingjiayi.service.BusinessService;
 import com.cj.jiaqingjiayi.service.CommoditiesService;
 import com.cj.jiaqingjiayi.service.SpecificationsCommoditiesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -33,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Slf4j
+@Api(tags = "商品接口")
 @RestController
 @RequestMapping("/commodities")
 public class CommoditiesController {
@@ -52,6 +55,7 @@ public class CommoditiesController {
      * @param commoditiesAddRequest 添加商品请求体
      * @return 是否成功
      */
+    @ApiOperation(value = "添加商品")
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> addCommodities (@RequestBody CommoditiesAddRequest commoditiesAddRequest, HttpServletRequest request) {
@@ -80,6 +84,7 @@ public class CommoditiesController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "删除商品")
     @PostMapping("/delete")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> deleteCommodities(@RequestBody CommoditiesDeleteRequest commoditiesDeleteRequest, HttpServletRequest request) {
@@ -110,6 +115,7 @@ public class CommoditiesController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "更新商品")
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> updateCommodities (@RequestBody CommoditiesUpdateRequest commoditiesUpdateRequest, HttpServletRequest request) {
@@ -139,6 +145,7 @@ public class CommoditiesController {
      * @param request 前端请求
      * @return 是否成功
      */
+    @ApiOperation(value = "更新商品状态")
     @PostMapping("/update/status")
     public BaseResponse<Boolean> updateCommoditiesStatus (@RequestBody CommoditiesUpdateRequest commoditiesUpdateRequest, HttpServletRequest request) {
         Long id = commoditiesUpdateRequest.getId();
@@ -163,6 +170,7 @@ public class CommoditiesController {
      * @param commoditiesQueryRequest 查询请求体
      * @return 分页列表
      */
+    @ApiOperation(value = "获取商品脱敏列表")
     @PostMapping("/list/page/commoditiesVO")
     public BaseResponse<Page<CommoditiesVO>> commoditiesVOPage(@RequestBody CommoditiesQueryRequest commoditiesQueryRequest) {
         long current = commoditiesQueryRequest.getCurrent();

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/ManicuristController.java

@@ -11,6 +11,8 @@ import com.cj.jiaqingjiayi.model.request.manicurist.*;
 import com.cj.jiaqingjiayi.model.vo.ManicuristVO;
 import com.cj.jiaqingjiayi.service.ManicuristService;
 import com.cj.jiaqingjiayi.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,7 @@ import static com.cj.jiaqingjiayi.contant.UserConstant.USER_SALT;
 
 @RestController
 @Slf4j
+@Api(tags = "美甲师接口")
 @RequestMapping("/manicurist")
 public class ManicuristController {
 
@@ -42,6 +45,7 @@ public class ManicuristController {
      * @param adminManicuristAddRequest
      * @return
      */
+    @ApiOperation(value = "管理员添加美甲师")
     @PostMapping("/adminAdd")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Long> AdminAddManicurist(@RequestBody AdminManicuristAddRequest adminManicuristAddRequest, HttpServletRequest request) {
@@ -73,6 +77,7 @@ public class ManicuristController {
      * @param manicuristAddRequest
      * @return
      */
+    @ApiOperation(value = "认证美甲师")
     @PostMapping("/add")
     public BaseResponse<Long> addManicurist(@RequestBody ManicuristAddRequest manicuristAddRequest, HttpServletRequest request) {
         ThrowUtils.throwIf(manicuristAddRequest == null, ErrorCode.PARAMS_ERROR);
@@ -96,7 +101,9 @@ public class ManicuristController {
     /**
      * 删除美甲师
      */
+    @ApiOperation(value = "删除美甲师")
     @PostMapping("/deleteMan")
+    @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> DeleteManicurist(long id, HttpServletRequest request){
         //判断是否为管理员
         userService.isAdmin(request);
@@ -109,6 +116,7 @@ public class ManicuristController {
      * 管理员修改美甲师信息
      * 确认一定会传入美甲师的id？
      */
+    @ApiOperation(value = "管理修改美甲师信息")
     @PostMapping("/update")
     public BaseResponse<Boolean> UpdateManicurist(@RequestBody ManicuristUpdateRequest manicuristUpdateRequest, HttpServletRequest request){
         //判断是否为管理员
@@ -138,6 +146,8 @@ public class ManicuristController {
     /**
      *美甲师修改个人信息
      */
+    //TODO:后续可能会改
+    @ApiOperation(value = "美甲师修改个人信息")
     @PostMapping("/myUpdate")
     public BaseResponse<Boolean> MyUpdateManicurist(@RequestBody MyManicuristUpdateRequest myUpdateRequest, HttpServletRequest request){
         ThrowUtils.throwIf(myUpdateRequest == null, ErrorCode.NULL_ERROR);
@@ -164,6 +174,7 @@ public class ManicuristController {
     /**
      * 根据id查询美甲师(管理员)
      */
+    @ApiOperation(value = "根据id获取美甲师")
     @GetMapping("/queryById")
     public BaseResponse<Manicurist> QueryByIdManicurist(long manicuristId, HttpServletRequest request){
         userService.isAdmin(request);
@@ -178,6 +189,7 @@ public class ManicuristController {
     /**
      * 查询全部美甲师(管理员)
      */
+    @ApiOperation(value = "查询全部美甲师")
     @PostMapping("/queryAll")
     public BaseResponse<List<Manicurist>> QueryAllManicurist(HttpServletRequest request){
         userService.isAdmin(request);
@@ -189,6 +201,7 @@ public class ManicuristController {
     /**
      * 搜索美甲师
      */
+    @ApiOperation(value = "用户查询美甲师")
     @PostMapping("/userQuery")
     public BaseResponse<List<ManicuristVO>> UserQueryManicurist(@RequestBody ManicuristQueryRequest manicuristQueryRequest){
         ThrowUtils.throwIf(manicuristQueryRequest == null, ErrorCode.NULL_ERROR);

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/SpecificationsController.java

@@ -19,6 +19,8 @@ import com.cj.jiaqingjiayi.model.request.specifications.SpecificationsQueryReque
 import com.cj.jiaqingjiayi.model.request.specifications.SpecificationsUpdateRequest;
 import com.cj.jiaqingjiayi.model.vo.SpecificationsVO;
 import com.cj.jiaqingjiayi.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -34,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Slf4j
+@Api(tags = "规格接口")
 @RestController
 @RequestMapping("/specifications")
 public class SpecificationsController {
@@ -59,6 +62,7 @@ public class SpecificationsController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "添加规格")
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> addSpecifications(@RequestBody SpecificationsAddRequest specificationsAddRequest, HttpServletRequest request){
@@ -86,6 +90,7 @@ public class SpecificationsController {
      * @param request 网络请求
      * @return 是否成功
      */
+    @ApiOperation(value = "更新规格")
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> updateSpecifications(@RequestBody SpecificationsUpdateRequest specificationsUpdateRequest, HttpServletRequest request) {
@@ -113,6 +118,7 @@ public class SpecificationsController {
      * @param specificationsMyQueryRequest 请求体
      * @return 脱敏列表
      */
+    @ApiOperation(value = "根据id获取规格")
     @PostMapping("/list/specificationsVOByComId")
     public BaseResponse<List<SpecificationsVO>> specificationsVOByComId(@RequestBody SpecificationsMyQueryRequest specificationsMyQueryRequest) {
         if (specificationsMyQueryRequest == null) {
@@ -133,6 +139,7 @@ public class SpecificationsController {
      * @param request 网络请求
      * @return 脱敏列表
      */
+    @ApiOperation(value = "获取规格列表")
     @PostMapping("/list/specificationsVO")
     public BaseResponse<List<SpecificationsVO>> specificationsVOList(@RequestBody SpecificationsQueryRequest specificationsQueryRequest, HttpServletRequest request) {
         //获取商家id

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/UserController.java

@@ -11,6 +11,9 @@ import com.cj.jiaqingjiayi.model.domain.User;
 import com.cj.jiaqingjiayi.model.request.user.*;
 import com.cj.jiaqingjiayi.model.vo.LoginUserVO;
 import com.cj.jiaqingjiayi.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.DigestUtils;
@@ -26,6 +29,7 @@ import java.util.stream.Collectors;
 
 import static com.cj.jiaqingjiayi.contant.UserConstant.*;
 
+@Api(tags = "用户接口")
 @RestController
 @RequestMapping("/user")
 public class UserController {
@@ -42,6 +46,7 @@ public class UserController {
      * @param userRegisterRequest
      * @return
      */
+    @ApiOperation(value = "用户注册")
     @PostMapping("/register")
     public BaseResponse<Long> userRegister(@RequestBody UserRegisterRequest userRegisterRequest) {
         if (userRegisterRequest == null){
@@ -68,6 +73,7 @@ public class UserController {
      * @param request 前端请求对象
      * @return
      */
+    @ApiOperation(value = "用户登录")
     @PostMapping("/login")
     public BaseResponse<LoginUserVO> userLogin(@RequestBody UserLoginRequest userLoginRequest, HttpServletRequest request) {
         if (userLoginRequest == null) {
@@ -90,6 +96,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "用户注销")
     @PostMapping("/logout")
     public BaseResponse<Integer> userLogout(HttpServletRequest request) {
         if (request == null) {
@@ -105,6 +112,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "查询用户")
     @GetMapping("/search")
     public BaseResponse<List<User>> searchUsers(UserSearchRequest searchRequest, HttpServletRequest request){
         //判断是否为管理员
@@ -123,6 +131,7 @@ public class UserController {
      *
      * @return 用户列表
      */
+    @ApiOperation(value = "分页查询用户")
     @PostMapping("/list/page")
     public BaseResponse<Page<User>> listUserByPage(@RequestBody UserSearchRequest userSearchRequest, HttpServletRequest request) {
         //判断是否为管理员
@@ -140,6 +149,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "删除用户")
     @PostMapping("/delete")
     public BaseResponse<Boolean> deleteUser(@RequestBody UserDeleteRequest deleteRequest, HttpServletRequest request){
         //判断是否为管理员
@@ -156,6 +166,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "获取当前登录用户")
     @GetMapping("/current")
     public BaseResponse<LoginUserVO> getLoginUser(HttpServletRequest request){
         //获取登录态
@@ -170,6 +181,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "根据id获取用户")
     @GetMapping("/getById")
     public BaseResponse<User> getUserById(long id, HttpServletRequest request){
         //判断是否为管理员
@@ -190,6 +202,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "用户修改密码")
     @PostMapping("/password/update")
     public BaseResponse<Boolean> updateUserPassword(@RequestBody UserUpdatePasswordRequest updatePasswordRequest,
                                                     HttpServletRequest request){
@@ -207,6 +220,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "管理员添加用户")
     @PostMapping("/add")
     public BaseResponse<Long> addUser(@RequestBody UserAddRequest userAddRequest, HttpServletRequest request){
         //判断是否为管理员
@@ -260,6 +274,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "管理员更新用户信息")
     @PostMapping("/update")
     public BaseResponse<Boolean> updateUser(@RequestBody UserUpdateRequest userUpdateRequest, HttpServletRequest request){
         //判断是否为管理员
@@ -279,6 +294,7 @@ public class UserController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "用户更新个人信息")
     @PostMapping("/user/update")
     public BaseResponse<Boolean> updateMyUser(@RequestBody UserUpdateMyRequest userUpdateMyRequest, HttpServletRequest request){
 

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/domain/Manicurist.java

@@ -33,7 +33,7 @@ public class Manicurist implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/AdminManicuristAddRequest.java

@@ -23,7 +23,7 @@ public class AdminManicuristAddRequest implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/ManicuristAddRequest.java

@@ -15,7 +15,7 @@ public class ManicuristAddRequest  implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/ManicuristQueryRequest.java

@@ -36,7 +36,7 @@ public class ManicuristQueryRequest extends PageRequest implements Serializable
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/ManicuristUpdateRequest.java

@@ -27,7 +27,7 @@ public class ManicuristUpdateRequest implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/manicurist/MyManicuristUpdateRequest.java

@@ -17,7 +17,7 @@ public class MyManicuristUpdateRequest implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/vo/ManicuristVO.java

@@ -13,7 +13,7 @@ public class ManicuristVO implements Serializable {
     /**
      * 美甲师姓名
      */
-    private String name;
+    private String manicuristName;
 
     /**
      * 性别

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/UserService.java

@@ -60,6 +60,11 @@ public interface UserService extends IService<User> {
 
     LoginUserVO getLoginUserVO(User user);
 
+    /**
+     * 判断是否登录
+     */
+    Long isLogin(HttpServletRequest request);
+
     /**
      * 判断是否为管理员
      */

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/ManicuristServiceImpl.java

@@ -46,6 +46,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
     @Resource
     private ManicuristAuthService manicuristAuthService;
 
+    //管理员添加美甲师
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void adminAddManicurist(User user, Manicurist manicurist, ManicuristAuth manicuristAuth) {
@@ -53,7 +54,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
         String encryptPassword = DigestUtils.md5DigestAsHex((USER_SALT + user.getUserPassword()).getBytes());
         user.setUserPassword(encryptPassword);
         //往user表中补充美甲师信息
-        user.setUsername(manicurist.getName());
+        user.setUsername(manicurist.getManicuristName());
         user.setAvatarUrl(manicurist.getManicuristAvatar());
         user.setPhone(manicurist.getPhone());
 
@@ -73,6 +74,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
         ThrowUtils.throwIf(!save2, ErrorCode.OPERATION_ERROR, "添加美甲师认证信息失败");
     }
 
+    //用户注册美甲师
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addManicurist(User loginUser, Manicurist manicurist, ManicuristAuth manicuristAuth) {
@@ -83,7 +85,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
         loginUser.setUserRole(3);
 
         //往user表中补充美甲师信息
-        loginUser.setUsername(manicurist.getName());
+        loginUser.setUsername(manicurist.getManicuristName());
         loginUser.setAvatarUrl(manicurist.getManicuristAvatar());
         loginUser.setPhone(manicurist.getPhone());
 
@@ -129,7 +131,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
     @Override
     public void validManicurist(Manicurist manicurist, boolean add) {
         Long id = manicurist.getId();
-        String manicuristName = manicurist.getName();
+        String manicuristName = manicurist.getManicuristName();
         String manicuristPhone = manicurist.getPhone();
         Integer gender = manicurist.getGender();
 
@@ -147,7 +149,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
 
         if(StringUtils.isNotBlank(manicuristName)){
             QueryWrapper<Manicurist> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("name", manicuristName);
+            queryWrapper.eq("manicuristName", manicuristName);
             long count = this.count(queryWrapper);
             ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "美甲师名称重复");
         }
@@ -184,6 +186,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteMan(long id) {
         Manicurist manicurist = this.getById(id);
         ThrowUtils.throwIf(manicurist == null, ErrorCode.OPERATION_ERROR, "删除的美甲师不存在");
@@ -225,7 +228,7 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
         Long id = manicuristQueryRequest.getId();
         Long userId = manicuristQueryRequest.getUserId();
         Long businessId = manicuristQueryRequest.getBusinessId();
-        String name = manicuristQueryRequest.getName();
+        String manicuristName = manicuristQueryRequest.getManicuristName();
         Integer gender = manicuristQueryRequest.getGender();
         String Phone = manicuristQueryRequest.getPhone();
         String email = manicuristQueryRequest.getEmail();
@@ -248,8 +251,8 @@ public class ManicuristServiceImpl extends ServiceImpl<ManicuristMapper, Manicur
             queryWrapper.eq("businessId", businessId);
         }
 
-        if (ObjectUtils.isNotEmpty(name)) {
+        if (ObjectUtils.isNotEmpty(manicuristName)) {
-            queryWrapper.eq("name", name);
+            queryWrapper.eq("manicuristName", manicuristName);
         }
 
         if (ObjectUtils.isNotEmpty(gender)) {

project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/UserServiceImpl.java

@@ -313,6 +313,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User>
         return loginUserVO;
     }
 
+    @Override
+    public Long isLogin(HttpServletRequest request) {
+        Object userObj = request.getSession().getAttribute(USER_LOGIN_STATE);
+        User currentUser = (User) userObj;
+        if(currentUser == null){
+            throw new BusinessException(ErrorCode.NOT_LOGIN, "未登录");
+        }
+        else{
+            return currentUser.getId();
+        }
+    }
+
     /**
      * 判断是否为管理员
      */

project/jiaqingjiayi/src/main/resources/mapper/ManicuristMapper.xml

@@ -8,7 +8,7 @@
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="businessId" column="businessId" jdbcType="BIGINT"/>
             <result property="userId" column="userId" jdbcType="BIGINT"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="manicuristName" column="manicuristName" jdbcType="VARCHAR"/>
             <result property="gender" column="gender" jdbcType="TINYINT"/>
             <result property="phone" column="phone" jdbcType="VARCHAR"/>
             <result property="email" column="email" jdbcType="VARCHAR"/>
@@ -23,7 +23,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,userId,name,
+        id,userId,manicuristName,
         gender,phone,email,
         employment_date,specialties,rating,
         salary,isDelete,createTime,