琴房价格配置接口

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PianoRoomSettingsController.java

@@ -0,0 +1,70 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomSettingsSearch;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomSettingsService;
+
+import java.util.Date;
+
+@RestController
+@RequestMapping("/pianoRoomSettings")
+@Api(value = "琴房时长价格配置", tags = "")
+public class PianoRoomSettingsController extends BaseController {
+
+    @Autowired
+    private PianoRoomSettingsService pianoRoomSettingsService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<PianoRoomSettingsVo> detail(@PathVariable("id") Long id) {
+        return succeed(pianoRoomSettingsService.detail(id));
+    }
+
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入pianoRoomSettingsSearch")
+    public HttpResponseResult<PageInfo<PianoRoomSettingsVo>> page(@RequestBody PianoRoomSettingsSearch query) {
+        IPage<PianoRoomSettingsVo> pages = pianoRoomSettingsService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/update")
+    @ApiOperation(value = "修改", notes = "传入pianoRoomSettings")
+    public HttpResponseResult update(@Valid @RequestBody PianoRoomSettings pianoRoomSettings) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || user.getId() == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        pianoRoomSettings.setUpdateBy(user.getId());
+        pianoRoomSettings.setUpdateTime(new Date());
+        return status(pianoRoomSettingsService.updateById(pianoRoomSettings));
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PianoRoomSettingsDao.java

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomSettingsSearch;
+
+
+public interface PianoRoomSettingsDao extends BaseMapper<PianoRoomSettings>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-05-30 15:54:20
+     * @return: com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo
+	 */
+	PianoRoomSettingsVo detail(@Param("id") Long id);
+	/**
+	 * 分页查询
+	 * @author liweifan
+	 * @date 2022-04-25 14:34:49
+	 * @return: com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo
+	 */
+	List<PianoRoomSettingsVo> selectPage(@Param("page") IPage page, @Param("param") PianoRoomSettingsSearch param);
+	/***
+	 * 查询集合
+	 * @author liweifan
+	 * @param: param
+	 * @updateTime 2022/4/25 14:58
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo>
+	 */
+	List<PianoRoomSettingsVo> selectList(@Param("param") PianoRoomSettingsSearch param);
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentDao.java

@@ -21,6 +21,14 @@ public interface StudentDao extends BaseMapper<Student> {
      * @return: com.yonge.cooleshow.biz.dal.vo.StudentVo
      */
     StudentVo detail(@Param("userId") Long userId);
+    /***
+     * 查询详情
+     * @author liweifan
+     * @param: phone
+     * @updateTime 2022/3/24 18:14
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentVo
+     */
+    StudentVo detailByPhone(@Param("phone")String phone);
 
     /**
      * 自定义分页

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserBindingTeacherDao.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.entity.UserBindingTeacher;
 import com.yonge.cooleshow.biz.dal.vo.CourseStudentVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -15,5 +16,8 @@ import java.util.Map;
  */
 public interface UserBindingTeacherDao extends BaseMapper<UserBindingTeacher> {
     //查询学员
-    IPage<CourseStudentVo> selectStudent(Page<CourseStudentVo> pageInfo,@Param("param") Map<String, Object> param);
+    IPage<CourseStudentVo> selectStudent(Page<CourseStudentVo> pageInfo, @Param("param") Map<String, Object> param);
+    //查询绑定的老师
+    TeacherVo getBindTeacherByPhone(@Param("phone") String phone);
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomSettingsDto.java

@@ -0,0 +1,24 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+import io.swagger.annotations.ApiModel;
+import org.apache.commons.beanutils.BeanUtils;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-05-30 15:54:20
+ */
+@ApiModel(value = "PianoRoomSettingsDto对象", description = "数据传输对象")
+public class PianoRoomSettingsDto extends PianoRoomSettings{
+	private static final long serialVersionUID = 1L;
+    
+    public PianoRoomSettingsDto buildDto(PianoRoomSettings pianoRoomSettings){
+        try {
+            BeanUtils.copyProperties(this,pianoRoomSettings);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/PianoRoomSettingsSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-05-30 15:54:20
+ */
+@ApiModel(value = "PianoRoomSettingsSearch对象", description = "查询对象")
+public class PianoRoomSettingsSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PianoRoomSettings.java

@@ -0,0 +1,123 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+@TableName("piano_room_settings")
+@ApiModel(value = "PianoRoomSettings对象", description = "琴房时长价格配置")
+public class PianoRoomSettings implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("时长（分） ")
+	@TableField(value = "times_")
+    private Integer times;
+    @ApiModelProperty("销售价 ")
+	@TableField(value = "sale_price_")
+    private BigDecimal salePrice;
+    @ApiModelProperty("原价 ")
+	@TableField(value = "original_price_")
+    private BigDecimal originalPrice;
+    @ApiModelProperty("描述 ")
+	@TableField(value = "description_")
+    private String description;
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+    
+	public BigDecimal getSalePrice() {
+        return salePrice;
+    }
+
+    public void setSalePrice(BigDecimal salePrice) {
+        this.salePrice = salePrice;
+    }
+    
+	public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
+    
+	public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GoodTypeEnum.java

@@ -14,7 +14,8 @@ public enum GoodTypeEnum implements BaseEnum<String, GoodTypeEnum> {
     PRACTICE("陪练课购买"),
     LIVE("直播课购买"),
     VIDEO("视频课购买"),
-    MUSIC("单曲点播");
+    MUSIC("单曲点播"),
+    PINAO_ROOM("琴房时长");
     @EnumValue
     private String code;
     private String msg;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/PianoRoomSettingsService.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomSettingsSearch;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+
+import java.util.List;
+
+/**
+ *  服务类
+ * @author liweifan
+ * @date 2022-05-30
+ */
+public interface PianoRoomSettingsService extends IService<PianoRoomSettings>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-05-30
+     */
+	PianoRoomSettingsVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-05-30
+     */
+    IPage<PianoRoomSettingsVo> selectPage(IPage<PianoRoomSettingsVo> page, PianoRoomSettingsSearch query);
+
+	List<PianoRoomSettingsVo> selectList(PianoRoomSettingsSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentService.java

@@ -6,10 +6,8 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.vo.MyFollow;
-import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentTotalVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 import java.util.List;
 import java.util.Map;
@@ -31,6 +29,13 @@ public interface StudentService extends IService<Student> {
     StudentVo detail(Long userId);
 
     /**
+     * 查询学员详情
+     * @param phone
+     * @return
+     */
+    StudentVo detailByPhone(String phone);
+
+    /**
      * 自定义分页
      *
      * @author liweifan
@@ -75,4 +80,12 @@ public interface StudentService extends IService<Student> {
      */
     IPage<MyFollow> queryMyFollow(IPage<MyFollow> page, Long studentId);
 
+    /**
+     * 学院绑定老师
+     * @param phone
+     * @param userId
+     * @param isUpdate
+     * @return
+     */
+    HttpResponseResult<Map<String,TeacherVo>> bindTeacher(String phone, Long userId, Boolean isUpdate);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PianoRoomSettingsServiceImpl.java

@@ -0,0 +1,41 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomSettingsSearch;
+import com.yonge.cooleshow.biz.dal.dao.PianoRoomSettingsDao;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomSettingsService;
+
+import java.util.List;
+
+
+@Service
+public class PianoRoomSettingsServiceImpl extends ServiceImpl<PianoRoomSettingsDao, PianoRoomSettings> implements PianoRoomSettingsService {
+    private final static Logger log = LoggerFactory.getLogger(PianoRoomSettingsServiceImpl.class);
+
+	@Override
+    public PianoRoomSettingsVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+   /*  @Override
+    public IPage<PianoRoomSettingsVo> selectPage(IPage<PianoRoomSettingsVo> page, PianoRoomSettingsSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }*/
+
+    @Override
+    public IPage<PianoRoomSettingsVo> selectPage(IPage<PianoRoomSettingsVo> page, PianoRoomSettingsSearch query) {
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+
+    @Override
+    public List<PianoRoomSettingsVo> selectList(PianoRoomSettingsSearch query) {
+        return baseMapper.selectList(query);
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -1,15 +1,19 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
+import com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.entity.UserBindingTeacher;
 import com.yonge.cooleshow.biz.dal.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
-import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
 import org.apache.commons.beanutils.BeanUtils;
@@ -28,9 +32,14 @@ import java.util.concurrent.TimeUnit;
 public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> implements StudentService {
     @Autowired
     private RedissonClient redissonClient;
-
     @Autowired
     private StudentTotalService totalService;
+    @Autowired
+    private UserBindingTeacherDao userBindingTeacherDao;
+    @Autowired
+    private StudentService studentService;
+    @Autowired
+    private TeacherDao teacherDao;
 
     @Override
     public StudentVo detail(Long userId) {
@@ -38,6 +47,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     }
 
     @Override
+    public StudentVo detailByPhone(String phone) {
+        return baseMapper.detailByPhone(phone);
+    }
+
+    @Override
     public IPage<StudentVo> selectPage(IPage<StudentVo> page, StudentSearch studentSearch) {
         return page.setRecords(baseMapper.selectPage(page, studentSearch));
     }
@@ -95,4 +109,44 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         return page.setRecords(teacherVos);
     }
 
+    @Override
+    public HttpResponseResult<Map<String, TeacherVo>> bindTeacher(String phone, Long userId, Boolean isUpdate) {
+        Map<String, TeacherVo> resMap = new HashMap<>();
+        TeacherVo old = userBindingTeacherDao.getBindTeacherByPhone(phone);
+        if (null != old) {
+            //身份证号、手机号脱敏
+            old.setIdCardNo(ValueUtil.fuzzyIdCard(old.getIdCardNo()));
+            old.setPhone(ValueUtil.fuzzyMobile(old.getPhone()));
+        }
+        resMap.put("old", old);
+
+        StudentVo studentVo = studentService.detailByPhone(phone);
+
+        if (null == studentVo) {
+            return HttpResponseResult.failed("未找到用户信息");
+        }
+        TeacherVo detail = teacherDao.detail(userId);
+        if (null != detail) {
+            //身份证号、手机号脱敏
+            detail.setIdCardNo(ValueUtil.fuzzyIdCard(detail.getIdCardNo()));
+            detail.setPhone(ValueUtil.fuzzyMobile(detail.getPhone()));
+        }
+        if (null == detail) {
+            return HttpResponseResult.failed("未找老师信息");
+        }
+        if (null == old || (null != isUpdate && isUpdate)) {
+            //更新
+            //删除用户绑定
+            userBindingTeacherDao.delete(Wrappers.<UserBindingTeacher>lambdaQuery()
+                    .eq(UserBindingTeacher::getStudentId, studentVo.getUserId()));
+
+            UserBindingTeacher userBindingTeacher = new UserBindingTeacher();
+            userBindingTeacher.setTeacherId(userId);
+            userBindingTeacher.setStudentId(studentVo.getUserId());
+            userBindingTeacherDao.insert(userBindingTeacher);
+        }
+        resMap.put("now", detail);
+        return HttpResponseResult.succeed(resMap);
+    }
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomSettingsVo.java

@@ -0,0 +1,24 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
+import io.swagger.annotations.ApiModel;
+import org.apache.commons.beanutils.BeanUtils;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-05-30 15:54:20
+ */
+@ApiModel(value = "PianoRoomSettingsVo对象", description = "查询视图对象")
+public class PianoRoomSettingsVo extends PianoRoomSettings{
+	private static final long serialVersionUID = 1L;
+    
+    public PianoRoomSettingsVo buildVo(PianoRoomSettings pianoRoomSettings){
+        try {
+            BeanUtils.copyProperties(this,pianoRoomSettings);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
+
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/PianoRoomSettingsMapper.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.PianoRoomSettingsDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings">
+            <result column="id_" property="id" />
+	        <result column="times_" property="times" />
+	        <result column="sale_price_" property="salePrice" />
+	        <result column="original_price_" property="originalPrice" />
+	        <result column="description_" property="description" />
+	        <result column="create_by_" property="createBy" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_by_" property="updateBy" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.times_ as times
+        , t.sale_price_ as salePrice
+        , t.original_price_ as originalPrice
+        , t.description_ as description
+        , t.create_by_ as createBy
+        , t.create_time_ as createTime
+        , t.update_by_ as updateBy
+        , t.update_time_ as updateTime
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo">
+        SELECT
+            <include refid="baseColumns"/>,
+            ifnull(u.real_name_,u.username_) modifierName
+        FROM piano_room_settings t
+        LEFT JOIN sys_user u on t.update_by_ = u.id_
+        where t.id_ = #{id}
+    </select>
+
+    <sql id="selectSql">
+        SELECT
+            <include refid="baseColumns" />,
+            ifnull(u.real_name_,u.username_) modifierName
+        FROM piano_room_settings t
+        LEFT JOIN sys_user u on t.update_by_ = u.id_
+    </sql>
+
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo">
+        <include refid="selectSql"/>
+    </select>
+
+    <select id="selectList" resultType="com.yonge.cooleshow.biz.dal.vo.PianoRoomSettingsVo">
+        <include refid="selectSql"/>
+    </select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -29,6 +29,7 @@
     <update id="setSubject">
         update student set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
     </update>
+
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
         SELECT
             <include refid="baseColumns"/>,
@@ -49,6 +50,26 @@
         left join sys_user u on t.user_id_ = u.id_
         where t.user_id_ = #{userId}
     </select>
+    <select id="detailByPhone" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
+        SELECT
+            <include refid="baseColumns"/>,
+            u.avatar_ as avatar,
+            u.real_name_ as realName,
+            u.id_card_no_ as idCardNo,
+            u.username_ as username,
+            u.gender_ as gender,
+            u.birthdate_ as birthdate,
+            TIMESTAMPDIFF(YEAR, u.birthdate_, CURDATE()) as age,
+            u.phone_ as phone,
+            (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
+            (!isnull(membership_end_time_) and membership_end_time_ > now()) as isVip,
+            (
+                SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
+            ) as subjectName
+        FROM student t
+        left join sys_user u on t.user_id_ = u.id_
+        where u.phone_ = #{phone}
+    </select>
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
         SELECT

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserBindingTeacherMapper.xml

@@ -31,4 +31,51 @@
             </if>
         </where>
     </select>
+
+    <!-- 表字段 -->
+    <sql id="teacherColumns">
+        t.user_id_ as "userId"
+        , t.education_background_ as "educationBackground"
+        , t.graduate_school_ as "graduateSchool"
+        , t.technical_titles_ as "technicalTitles"
+        , t.work_unit_ as "workUnit"
+        , t.subject_id_ as "subjectId"
+        , t.introduction_ as "introduction"
+        , t.subject_ as "subject"
+        , t.grad_certificate_ as "gradCertificate"
+        , t.degree_certificate_ as "degreeCertificate"
+        , t.teacher_certificate_ as "teacherCertificate"
+        , t.entry_flag_ as "entryFlag"
+        , t.entry_auth_date_ as "entryAuthDate"
+        , t.musician_flag_ as "musicianFlag"
+        , t.musician_date_ as "musicianDate"
+        , t.live_flag_ as "liveFlag"
+        , t.live_date_ as "liveDate"
+        , t.memo_ as "memo"
+        , t.create_time_ as "createTime"
+        , t.update_time_ as "updateTime"
+    </sql>
+
+    <select id="getBindTeacherByPhone" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherVo">
+        SELECT
+            <include refid="teacherColumns"/>,
+            u.avatar_ as avatar,
+            u.username_ as username,
+            u.gender_ as `gender`,
+            u.birthdate_ as birthdate,
+            u.phone_ as phone,
+            (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
+            u.real_name_ as realName,
+            u.id_card_no_ as idCardNo,
+            (
+                SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
+            ) as subjectName
+        FROM (
+            select a.* from user_binding_teacher a
+            left join sys_user b on a.student_id_ = b.id_
+            where b.phone_ = #{phone}
+        ) a
+        left join teacher t on a.teacher_id_ = t.user_id_
+        left join sys_user u on t.user_id_ = u.id_
+    </select>
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/config/ResourceServerConfig.java

@@ -28,7 +28,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .antMatchers("/task/**")
                 .hasIpAddress("0.0.0.0/0")
-                .antMatchers("/wechat/*", "/v2/api-docs", "/code/*", "/payment/callback", "/userOrder/setSuccessStatus")
+                .antMatchers("/wechat/*", "/v2/api-docs", "/code/*","/open/**", "/payment/callback", "/userOrder/setSuccessStatus")
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MemberPriceSettingsController.java

@@ -25,6 +25,15 @@ public class MemberPriceSettingsController extends BaseController {
 	@Autowired
 	private SysConfigService sysConfigService;
 
+	/**
+	 * 查询单条
+	 */
+	@GetMapping("/detail/{id}")
+	@ApiOperation(value = "详情", notes = "传入id")
+	public HttpResponseResult<MemberPriceSettingsVo> detail(@PathVariable("id") Long id) {
+		return succeed(memberPriceSettingsService.detail(id));
+	}
+
 	@PostMapping("/list")
 	@ApiOperation(value = "查询列表")
 	public HttpResponseResult<List<MemberPriceSettingsVo>> list(@RequestBody MemberPriceSettingsSearch query) {

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -5,7 +5,6 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -22,7 +21,6 @@ import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/student")

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/open/OpenClient.java

@@ -0,0 +1,58 @@
+package com.yonge.cooleshow.student.open;
+
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import com.yonge.toolset.utils.string.ValueUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.Map;
+
+
+@RestController
+@RequestMapping("/open")
+@Api(value = "开放权限接口")
+public class OpenClient extends BaseController {
+    @Autowired
+    private TeacherService teacherService;
+
+    @Autowired
+    private StudentService studentService;
+
+    @ApiOperation(value = "查询老师头像昵称信息")
+    @GetMapping("/getTeacher")
+    public HttpResponseResult<TeacherVo> getTeacher(@ApiParam(value = "老师ID", required = true) @RequestParam("userId") Long userId) {
+        if (null == userId) {
+            return failed("缺少老师ID");
+        }
+        TeacherVo detail = teacherService.detail(userId);
+        detail.setIdCardNo(ValueUtil.fuzzyIdCard(detail.getIdCardNo()));
+        detail.setPhone(ValueUtil.fuzzyMobile(detail.getPhone()));
+        return HttpResponseResult.succeed(detail);
+    }
+
+    @ApiOperation(value = "绑定老师")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "userId", value = "老师id", required = true),
+            @ApiImplicitParam(name = "isUpdate", value = "是否更新绑定老师", dataType = "Boolean")
+    })
+    @GetMapping("/bindTeacher")
+    public HttpResponseResult<Map<String,TeacherVo>> bindTeacher(String phone, Long userId, Boolean isUpdate) {
+        if (StringUtil.isEmpty(phone)) {
+            return failed("缺少手机号");
+        }
+        if (null == userId) {
+            return failed("缺少老师ID");
+        }
+        return studentService.bindTeacher(phone, userId, isUpdate);
+    }
+}