代码提交

cooleshow-common/src/main/java/com/yonge/cooleshow/common/controller/BaseController.java

@@ -63,6 +63,10 @@ public class BaseController {
 		return getResponseData(false, statusCode, null, msg);
 	}
 
+	public static <T> HttpResponseResult<T> status(boolean flag) {
+			return flag ? succeed() : failed("操作失败");
+	}
+
 	public static <T> HttpResponseResult<T> failed(HttpStatus statusCode, T data, String msg) {
 		return getResponseData(false, statusCode, data, msg);
 	}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/BaseService.java

@@ -69,7 +69,7 @@ public interface BaseService<PK extends Serializable, T> {
 	 * @param params
 	 * @return
 	 */
-	public PageInfo<T> queryPage(QueryInfo queryInfo);
+	public PageInfo<T> queryPage(QueryInfo params);
 
 	/**
 	 * 通过参数查找结果集数目

cooleshow-user/user-biz/pom.xml

@@ -1,30 +1,64 @@
 <?xml version="1.0"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.yonge.cooleshow</groupId>
-		<artifactId>cooleshow-user</artifactId>
-		<version>1.0</version>
-	</parent>
-	<groupId>com.yonge.cooleshow</groupId>
-	<artifactId>user-biz</artifactId>
-	<version>1.0</version>
-	<name>user-biz</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>com.yonge.cooleshow</groupId>
-			<artifactId>cooleshow-common</artifactId>
-		</dependency>
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.yonge.cooleshow</groupId>
+        <artifactId>cooleshow-user</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>user-biz</artifactId>
+    <version>1.0</version>
+    <name>user-biz</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>cooleshow-common</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.spring4all</groupId>
-			<artifactId>swagger-spring-boot-starter</artifactId>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.12</version>
+        </dependency>
+
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.0.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/config/MyBatisPlusConfig.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.biz.dal.config;
+
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * @author hgw
+ * Created by 2021-12-02
+ */
+@Configuration
+public class MyBatisPlusConfig {
+
+    @Autowired
+    private MybatisPlusProperties plusProperties;
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    @Primary
+    public PaginationInterceptor paginationInterceptor() {
+        plusProperties.setMapperLocations(new String[]{"classpath*:/config/mybatis/*.xml"});
+        plusProperties.setTypeAliasesPackage("com.yonge.cooleshow.biz.dal.entity");
+        MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
+        mybatisConfiguration.setMapUnderscoreToCamelCase(true);
+        mybatisConfiguration.setCacheEnabled(false);
+        plusProperties.setConfiguration(mybatisConfiguration);
+        return new PaginationInterceptor();
+    }
+}

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

@@ -0,0 +1,16 @@
+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.entity.Order;
+
+public interface OrderDao extends BaseMapper<Order>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<Order> selectPage(IPage page, Order order);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.OrderDetail;
+
+public interface OrderDetailDao extends BaseMapper<OrderDetail>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<OrderDetail> selectPage(IPage page, OrderDetail orderDetail);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.OrderRefunds;
+
+public interface OrderRefundsDao extends BaseMapper<OrderRefunds>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<OrderRefunds> selectPage(IPage page, OrderRefunds orderRefunds);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.TeacherAuthEntryRecord;
+
+public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRecord>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<TeacherAuthEntryRecord> selectPage(IPage page, TeacherAuthEntryRecord teacherAuthEntryRecord);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.TeacherAuthMusicianRecord;
+
+public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusicianRecord>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<TeacherAuthMusicianRecord> selectPage(IPage page, TeacherAuthMusicianRecord teacherAuthMusicianRecord);
+	
+}

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

@@ -1,9 +1,16 @@
 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.entity.Teacher;
-import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface TeacherDao extends BaseDAO<Integer, Teacher> {
+public interface TeacherDao extends BaseMapper<Teacher>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<Teacher> selectPage(IPage page, Teacher teacher);
 	
 }

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

@@ -0,0 +1,16 @@
+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.entity.TeacherWithdrawal;
+
+public interface TeacherWithdrawalDao extends BaseMapper<TeacherWithdrawal>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<TeacherWithdrawal> selectPage(IPage page, TeacherWithdrawal teacherWithdrawal);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.UserAccount;
+
+public interface UserAccountDao extends BaseMapper<UserAccount>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<UserAccount> selectPage(IPage page, UserAccount userAccount);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.UserAccountRecord;
+
+public interface UserAccountRecordDao extends BaseMapper<UserAccountRecord>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<UserAccountRecord> selectPage(IPage page, UserAccountRecord userAccountRecord);
+	
+}

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

@@ -0,0 +1,16 @@
+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.entity.UserBankCard;
+
+public interface UserBankCardDao extends BaseMapper<UserBankCard>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<UserBankCard> selectPage(IPage page, UserBankCard userBankCard);
+	
+}

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

@@ -1,9 +1,16 @@
 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.entity.VipCard;
-import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface VipCardDao extends BaseDAO<Long, VipCard> {
+public interface VipCardDao extends BaseMapper<VipCard>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VipCard> selectPage(IPage page, VipCard vipCard);
 	
 }

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

@@ -0,0 +1,209 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+/**
+ * 平台订单表
+ */
+@Data
+@TableName("order")
+@ApiModel(value = "Order对象", description = "平台订单表")
+public class Order implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 订单号 
+    */
+    @ApiModelProperty("订单号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    /** 
+    * 买家id 
+    */
+    @ApiModelProperty("买家id ")
+	@TableField(value = "user_id_")
+    private Integer userId;
+    /** 
+    * 卖家id 
+    */
+    @ApiModelProperty("卖家id ")
+	@TableField(value = "merch_id_")
+    private Long merchId;
+    /** 
+    * 订单名称 
+    */
+    @ApiModelProperty("订单名称 ")
+	@TableField(value = "order_name_")
+    private String orderName;
+    /** 
+    * 订单描述信息 
+    */
+    @ApiModelProperty("订单描述信息 ")
+	@TableField(value = "order_desc_")
+    private String orderDesc;
+    /** 
+    * 订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 
+    */
+    @ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 ")
+	@TableField(value = "status_")
+    private String status;
+    /** 
+    * 原价 
+    */
+    @ApiModelProperty("原价 ")
+	@TableField(value = "original_price_")
+    private BigDecimal originalPrice;
+    /** 
+    * 预计价格 
+    */
+    @ApiModelProperty("预计价格 ")
+	@TableField(value = "expect_price_")
+    private BigDecimal expectPrice;
+    /** 
+    * 实际价格 
+    */
+    @ApiModelProperty("实际价格 ")
+	@TableField(value = "actual_price_")
+    private BigDecimal actualPrice;
+    /** 
+    * 优惠金额 
+    */
+    @ApiModelProperty("优惠金额 ")
+	@TableField(value = "coupon_amount_")
+    private BigDecimal couponAmount;
+    /** 
+    * 平台服务费 
+    */
+    @ApiModelProperty("平台服务费 ")
+	@TableField(value = "plantform_fee_")
+    private BigDecimal plantformFee;
+    /** 
+    * 平台服务费比例% 
+    */
+    @ApiModelProperty("平台服务费比例% ")
+	@TableField(value = "plantform_fee_rate_")
+    private BigDecimal plantformFeeRate;
+    /** 
+    * 退款金额 
+    */
+    @ApiModelProperty("退款金额 ")
+	@TableField(value = "refund_amount_")
+    private BigDecimal refundAmount;
+    /** 
+    * 用户备注 
+    */
+    @ApiModelProperty("用户备注 ")
+	@TableField(value = "user_note_")
+    private String userNote;
+    /** 
+    * 订单类型 1、开通会员  2、陪练课购买  3、直播课购买 4、视频课购买 5、单曲点播 
+    */
+    @ApiModelProperty("订单类型 1、开通会员  2、陪练课购买  3、直播课购买 4、视频课购买 5、单曲点播 ")
+	@TableField(value = "order_type_")
+    private String orderType;
+    /** 
+    * 下单时间 
+    */
+    @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 = "pay_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date payTime;
+    /** 
+    * 退款时间 
+    */
+    @ApiModelProperty("退款时间 ")
+	@TableField(value = "refund_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date refundTime;
+	@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;
+    /** 
+    * 交易流水号 
+    */
+    @ApiModelProperty("交易流水号 ")
+	@TableField(value = "trans_no_")
+    private String transNo;
+    /** 
+    * 支付渠道:  alipay 支付宝  wx_lite 微信 
+    */
+    @ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
+	@TableField(value = "pay_channel_")
+    private String payChannel;
+    /** 
+    * 交易金额，必须大于0，保留两位小数点，如0.10、100.05等 
+    */
+    @ApiModelProperty("交易金额，必须大于0，保留两位小数点，如0.10、100.05等 ")
+	@TableField(value = "pay_amt_")
+    private BigDecimal payAmt;
+    /** 
+    * 到账时间 
+    */
+    @ApiModelProperty("到账时间 ")
+	@TableField(value = "arrival_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date arrivalTime;
+    /** 
+    * 失败信息 
+    */
+    @ApiModelProperty("失败信息 ")
+	@TableField(value = "pay_fail_msg_")
+    private String payFailMsg;
+
+    @Override
+    public String toString() {
+        return "Order{" +
+				"id=" + id +
+						",orderNo='" + orderNo + "'" + 
+						",userId='" + userId + "'" + 
+						",merchId='" + merchId + "'" + 
+						",orderName='" + orderName + "'" + 
+						",orderDesc='" + orderDesc + "'" + 
+						",status='" + status + "'" + 
+						",originalPrice='" + originalPrice + "'" + 
+						",expectPrice='" + expectPrice + "'" + 
+						",actualPrice='" + actualPrice + "'" + 
+						",couponAmount='" + couponAmount + "'" + 
+						",plantformFee='" + plantformFee + "'" + 
+						",plantformFeeRate='" + plantformFeeRate + "'" + 
+						",refundAmount='" + refundAmount + "'" + 
+						",userNote='" + userNote + "'" + 
+						",orderType='" + orderType + "'" + 
+						",createTime='" + createTime + "'" + 
+						",payTime='" + payTime + "'" + 
+						",refundTime='" + refundTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",transNo='" + transNo + "'" + 
+						",payChannel='" + payChannel + "'" + 
+						",payAmt='" + payAmt + "'" + 
+						",arrivalTime='" + arrivalTime + "'" + 
+						",payFailMsg='" + payFailMsg + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,69 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 平台订单表
+ */
+@Data
+@TableName("order_detail")
+@ApiModel(value = "OrderDetail对象", description = "平台订单表")
+public class OrderDetail implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 订单号 
+    */
+    @ApiModelProperty("订单号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    /** 
+    * 业务id 
+    */
+    @ApiModelProperty("业务id ")
+	@TableField(value = "biz_id_")
+    private Long bizId;
+    /** 
+    * 业务内容 
+    */
+    @ApiModelProperty("业务内容 ")
+	@TableField(value = "biz_content_")
+    private String bizContent;
+    /** 
+    * 下单时间 
+    */
+    @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;
+	@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;
+
+    @Override
+    public String toString() {
+        return "OrderDetail{" +
+				"id=" + id +
+						",orderNo='" + orderNo + "'" + 
+						",bizId='" + bizId + "'" + 
+						",bizContent='" + bizContent + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,93 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+/**
+ * 用户退款表
+ */
+@Data
+@TableName("order_refunds")
+@ApiModel(value = "OrderRefunds对象", description = "用户退款表")
+public class OrderRefunds implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+	@TableField(value = "user_id_")
+    private Integer userId;
+    /** 
+    * 订单号 
+    */
+    @ApiModelProperty("订单号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    /** 
+    * 状态(1,审核中;2,通过;-1,拒绝;) 
+    */
+    @ApiModelProperty("状态(1,审核中;2,通过;-1,拒绝;) ")
+	@TableField(value = "status_")
+    private String status;
+    /** 
+    * 申请退费金额 
+    */
+    @ApiModelProperty("申请退费金额 ")
+	@TableField(value = "apply_amount_")
+    private BigDecimal applyAmount;
+    /** 
+    * 实际退费金额 
+    */
+    @ApiModelProperty("实际退费金额 ")
+	@TableField(value = "actual_amount_")
+    private BigDecimal actualAmount;
+    /** 
+    * 退款描述 
+    */
+    @ApiModelProperty("退款描述 ")
+	@TableField(value = "reason_")
+    private String reason;
+    /** 
+    * 操作人 
+    */
+    @ApiModelProperty("操作人 ")
+	@TableField(value = "operate_user_id_")
+    private Long operateUserId;
+	@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;
+	@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;
+	@TableField(value = "remark_")
+    private String remark;
+
+    @Override
+    public String toString() {
+        return "OrderRefunds{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",orderNo='" + orderNo + "'" + 
+						",status='" + status + "'" + 
+						",applyAmount='" + applyAmount + "'" + 
+						",actualAmount='" + actualAmount + "'" + 
+						",reason='" + reason + "'" + 
+						",operateUserId='" + operateUserId + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",remark='" + remark + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,148 +1,157 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(teacher):
+ * 教师表
  */
-public class Teacher {
-
-	@ApiModelProperty(value = "对应user表用户编号",required = false)
-	private Integer userId;
-	
-	@ApiModelProperty(value = "昵称",required = false)
-	private String nickName;
-	
-	@ApiModelProperty(value = "学历",required = false)
-	private String educationBackground;
-	
-	@ApiModelProperty(value = "毕业学校",required = false)
-	private String graduateSchool;
-	
-	@ApiModelProperty(value = "技术职称",required = false)
-	private String technicalTitles;
-	
-	@ApiModelProperty(value = "工作单位",required = false)
-	private String workUnit;
-	
-	@ApiModelProperty(value = "专业技能（支持多个，用逗号分隔），对应科目表编号",required = false)
-	private String subjectId;
-	
-	@ApiModelProperty(value = "入职时间",required = false)
-	private java.util.Date entryDate;
-	
-	@ApiModelProperty(value = "个人介绍",required = false)
-	private String introduction;
-	
-	@ApiModelProperty(value = "备注",required = false)
-	private String memo;
-	
-	@ApiModelProperty(value = "",required = false)
-	private java.util.Date updateTime;
-	
-	@ApiModelProperty(value = "",required = false)
-	private java.util.Date createTime;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setNickName(String nickName){
-		this.nickName = nickName;
-	}
-	
-	public String getNickName(){
-		return this.nickName;
-	}
-			
-	public void setEducationBackground(String educationBackground){
-		this.educationBackground = educationBackground;
-	}
-	
-	public String getEducationBackground(){
-		return this.educationBackground;
-	}
-			
-	public void setGraduateSchool(String graduateSchool){
-		this.graduateSchool = graduateSchool;
-	}
-	
-	public String getGraduateSchool(){
-		return this.graduateSchool;
-	}
-			
-	public void setTechnicalTitles(String technicalTitles){
-		this.technicalTitles = technicalTitles;
-	}
-	
-	public String getTechnicalTitles(){
-		return this.technicalTitles;
-	}
-			
-	public void setWorkUnit(String workUnit){
-		this.workUnit = workUnit;
-	}
-	
-	public String getWorkUnit(){
-		return this.workUnit;
-	}
-			
-	public void setSubjectId(String subjectId){
-		this.subjectId = subjectId;
-	}
-	
-	public String getSubjectId(){
-		return this.subjectId;
-	}
-			
-	public void setEntryDate(java.util.Date entryDate){
-		this.entryDate = entryDate;
-	}
-	
-	public java.util.Date getEntryDate(){
-		return this.entryDate;
-	}
-			
-	public void setIntroduction(String introduction){
-		this.introduction = introduction;
-	}
-	
-	public String getIntroduction(){
-		return this.introduction;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("teacher")
+@ApiModel(value = "Teacher对象", description = "教师表")
+public class Teacher implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 对应user表用户编号 
+    */
+    @ApiModelProperty("对应user表用户编号 ")
+    @TableId(value = "user_id_", type = IdType.UUID)
+    private Integer userId;
+    /** 
+    * 学历 
+    */
+    @ApiModelProperty("学历 ")
+	@TableField(value = "education_background_")
+    private String educationBackground;
+    /** 
+    * 毕业学校 
+    */
+    @ApiModelProperty("毕业学校 ")
+	@TableField(value = "graduate_school_")
+    private String graduateSchool;
+    /** 
+    * 技术职称 
+    */
+    @ApiModelProperty("技术职称 ")
+	@TableField(value = "technical_titles_")
+    private String technicalTitles;
+    /** 
+    * 工作单位 
+    */
+    @ApiModelProperty("工作单位 ")
+	@TableField(value = "work_unit_")
+    private String workUnit;
+    /** 
+    * 专业技能（支持多个，用逗号分隔），对应科目表编号 
+    */
+    @ApiModelProperty("专业技能（支持多个，用逗号分隔），对应科目表编号 ")
+	@TableField(value = "subject_id_")
+    private String subjectId;
+    /** 
+    * 老师入驻状态  1、审核中 2、通过 3、不通过 
+    */
+    @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
+	@TableField(value = "entry_status_")
+    private Integer entryStatus;
+    /** 
+    * 入驻时间 
+    */
+    @ApiModelProperty("入驻时间 ")
+	@TableField(value = "entry_auth_date_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date entryAuthDate;
+    /** 
+    * 个人介绍 
+    */
+    @ApiModelProperty("个人介绍 ")
+	@TableField(value = "introduction_")
+    private String introduction;
+    /** 
+    * 音乐人审核状态   1、审核中 2、通过 3、不通过 
+    */
+    @ApiModelProperty("音乐人审核状态   1、审核中 2、通过 3、不通过 ")
+	@TableField(value = "musician_auth_status_")
+    private String musicianAuthStatus;
+    /** 
+    * 音乐人认证时间 
+    */
+    @ApiModelProperty("音乐人认证时间 ")
+	@TableField(value = "musician_date_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date musicianDate;
+    /** 
+    * 学校专业 
+    */
+    @ApiModelProperty("学校专业 ")
+	@TableField(value = "subject_")
+    private String subject;
+    /** 
+    * 毕业证书 
+    */
+    @ApiModelProperty("毕业证书 ")
+	@TableField(value = "grad_certificate_")
+    private String gradCertificate;
+    /** 
+    * 学位证书 
+    */
+    @ApiModelProperty("学位证书 ")
+	@TableField(value = "degree__certificate_")
+    private String degreeCertificate;
+    /** 
+    * 教师资格证 
+    */
+    @ApiModelProperty("教师资格证 ")
+	@TableField(value = "teacher__certificate_")
+    private String teacherCertificate;
+    /** 
+    * 备注 
+    */
+    @ApiModelProperty("备注 ")
+	@TableField(value = "memo_")
+    private String memo;
+	@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;
+	@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;
 
-}
+    @Override
+    public String toString() {
+        return "Teacher{" +
+				"userId=" + userId +
+						",educationBackground='" + educationBackground + "'" + 
+						",graduateSchool='" + graduateSchool + "'" + 
+						",technicalTitles='" + technicalTitles + "'" + 
+						",workUnit='" + workUnit + "'" + 
+						",subjectId='" + subjectId + "'" + 
+						",entryStatus='" + entryStatus + "'" + 
+						",entryAuthDate='" + entryAuthDate + "'" + 
+						",introduction='" + introduction + "'" + 
+						",musicianAuthStatus='" + musicianAuthStatus + "'" + 
+						",musicianDate='" + musicianDate + "'" + 
+						",subject='" + subject + "'" + 
+						",gradCertificate='" + gradCertificate + "'" + 
+						",degreeCertificate='" + degreeCertificate + "'" + 
+						",teacherCertificate='" + teacherCertificate + "'" + 
+						",memo='" + memo + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,125 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 老师入驻审核表
+ */
+@Data
+@TableName("teacher_auth_entry_record")
+@ApiModel(value = "TeacherAuthEntryRecord对象", description = "老师入驻审核表")
+public class TeacherAuthEntryRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 审核单id 
+    */
+    @ApiModelProperty("审核单id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 对应user表用户编号 
+    */
+    @ApiModelProperty("对应user表用户编号 ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 专业技能（支持多个，用逗号分隔），对应乐器表id 
+    */
+    @ApiModelProperty("专业技能（支持多个，用逗号分隔），对应乐器表id ")
+	@TableField(value = "subject_id_")
+    private String subjectId;
+    /** 
+    * 个人介绍 
+    */
+    @ApiModelProperty("个人介绍 ")
+	@TableField(value = "introduction_")
+    private String introduction;
+    /** 
+    * 毕业学校 
+    */
+    @ApiModelProperty("毕业学校 ")
+	@TableField(value = "graduate_school_")
+    private String graduateSchool;
+    /** 
+    * 学校专业 
+    */
+    @ApiModelProperty("学校专业 ")
+	@TableField(value = "subject_")
+    private String subject;
+    /** 
+    * 毕业证书 
+    */
+    @ApiModelProperty("毕业证书 ")
+	@TableField(value = "grad_certificate_")
+    private String gradCertificate;
+    /** 
+    * 学位证书 
+    */
+    @ApiModelProperty("学位证书 ")
+	@TableField(value = "degree__certificate_")
+    private String degreeCertificate;
+    /** 
+    * 教师资格证 
+    */
+    @ApiModelProperty("教师资格证 ")
+	@TableField(value = "teacher__certificate_")
+    private String teacherCertificate;
+    /** 
+    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
+    */
+    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+	@TableField(value = "teacher_auth_status_")
+    private Integer teacherAuthStatus;
+    /** 
+    * 审核人 
+    */
+    @ApiModelProperty("审核人 ")
+	@TableField(value = "verify_user_id_")
+    private Long verifyUserId;
+    /** 
+    * 审核理由 
+    */
+    @ApiModelProperty("审核理由 ")
+	@TableField(value = "reason_")
+    private String reason;
+	@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;
+	@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;
+
+    @Override
+    public String toString() {
+        return "TeacherAuthEntryRecord{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",subjectId='" + subjectId + "'" + 
+						",introduction='" + introduction + "'" + 
+						",graduateSchool='" + graduateSchool + "'" + 
+						",subject='" + subject + "'" + 
+						",gradCertificate='" + gradCertificate + "'" + 
+						",degreeCertificate='" + degreeCertificate + "'" + 
+						",teacherCertificate='" + teacherCertificate + "'" + 
+						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
+						",verifyUserId='" + verifyUserId + "'" + 
+						",reason='" + reason + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,76 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 老师音乐人审核表
+ */
+@Data
+@TableName("teacher_auth_musician_record")
+@ApiModel(value = "TeacherAuthMusicianRecord对象", description = "老师音乐人审核表")
+public class TeacherAuthMusicianRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 审核单id 
+    */
+    @ApiModelProperty("审核单id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 对应user表用户编号 
+    */
+    @ApiModelProperty("对应user表用户编号 ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
+    */
+    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+	@TableField(value = "teacher_auth_status_")
+    private Integer teacherAuthStatus;
+    /** 
+    * 审核人 
+    */
+    @ApiModelProperty("审核人 ")
+	@TableField(value = "verify_user_id_")
+    private Long verifyUserId;
+    /** 
+    * 审核理由 
+    */
+    @ApiModelProperty("审核理由 ")
+	@TableField(value = "reason_")
+    private String reason;
+	@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;
+	@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;
+
+    @Override
+    public String toString() {
+        return "TeacherAuthMusicianRecord{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
+						",verifyUserId='" + verifyUserId + "'" + 
+						",reason='" + reason + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,129 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+/**
+ * 老师账户提现表
+ */
+@Data
+@TableName("teacher_withdrawal")
+@ApiModel(value = "TeacherWithdrawal对象", description = "老师账户提现表")
+public class TeacherWithdrawal implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 提现id 
+    */
+    @ApiModelProperty("提现id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 用户表id 
+    */
+    @ApiModelProperty("用户表id ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 账户变动记录id 
+    */
+    @ApiModelProperty("账户变动记录id ")
+	@TableField(value = "user_account_record_id_")
+    private Long userAccountRecordId;
+    /** 
+    * 提现金额 
+    */
+    @ApiModelProperty("提现金额 ")
+	@TableField(value = "amount_")
+    private BigDecimal amount;
+    /** 
+    * 平台服务费 
+    */
+    @ApiModelProperty("平台服务费 ")
+	@TableField(value = "plantform_fee_")
+    private BigDecimal plantformFee;
+    /** 
+    * 实际到账金额 
+    */
+    @ApiModelProperty("实际到账金额 ")
+	@TableField(value = "actual_amount_")
+    private String actualAmount;
+    /** 
+    * 银行卡 
+    */
+    @ApiModelProperty("银行卡 ")
+	@TableField(value = "bank_card_")
+    private String bankCard;
+    /** 
+    * 开户行 
+    */
+    @ApiModelProperty("开户行 ")
+	@TableField(value = "bank_name_")
+    private String bankName;
+    /** 
+    * 银行流水号 
+    */
+    @ApiModelProperty("银行流水号 ")
+	@TableField(value = "bank_flow_no_")
+    private String bankFlowNo;
+    /** 
+    * 转账时间 
+    */
+    @ApiModelProperty("转账时间 ")
+	@TableField(value = "transfer_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date transferTime;
+    /** 
+    * 发起时间 
+    */
+    @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_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    /** 
+    * 提现状态 
+    */
+    @ApiModelProperty("提现状态 ")
+	@TableField(value = "status_")
+    private Byte status;
+
+    @Override
+    public String toString() {
+        return "TeacherWithdrawal{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",userAccountRecordId='" + userAccountRecordId + "'" + 
+						",amount='" + amount + "'" + 
+						",plantformFee='" + plantformFee + "'" + 
+						",actualAmount='" + actualAmount + "'" + 
+						",bankCard='" + bankCard + "'" + 
+						",bankName='" + bankName + "'" + 
+						",bankFlowNo='" + bankFlowNo + "'" + 
+						",transferTime='" + transferTime + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",status='" + status + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,85 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+/**
+ * 老师账户表
+ */
+@Data
+@TableName("user_account")
+@ApiModel(value = "UserAccount对象", description = "老师账户表")
+public class UserAccount implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 用户表id 
+    */
+    @ApiModelProperty("用户表id ")
+    @TableId(value = "user_id_", type = IdType.UUID)
+    private Long userId;
+    /** 
+    * 总金额 
+    */
+    @ApiModelProperty("总金额 ")
+	@TableField(value = "amount_total")
+    private BigDecimal amountTotal;
+    /** 
+    * 可用余额 
+    */
+    @ApiModelProperty("可用余额 ")
+	@TableField(value = "amount_usable")
+    private BigDecimal amountUsable;
+    /** 
+    * 冻结金额 
+    */
+    @ApiModelProperty("冻结金额 ")
+	@TableField(value = "amount_frozen")
+    private BigDecimal amountFrozen;
+    /** 
+    * 状态 0-停用 1-使用 
+    */
+    @ApiModelProperty("状态 0-停用 1-使用 ")
+	@TableField(value = "status_")
+    private Byte status;
+    /** 
+    * 创建时间 
+    */
+    @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_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+    @Override
+    public String toString() {
+        return "UserAccount{" +
+				"userId=" + userId +
+						",amountTotal='" + amountTotal + "'" + 
+						",amountUsable='" + amountUsable + "'" + 
+						",amountFrozen='" + amountFrozen + "'" + 
+						",status='" + status + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,97 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+
+/**
+ * 老师账户流水表
+ */
+@Data
+@TableName("user_account_record")
+@ApiModel(value = "UserAccountRecord对象", description = "老师账户流水表")
+public class UserAccountRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 用户表id 
+    */
+    @ApiModelProperty("用户表id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 交易金额 
+    */
+    @ApiModelProperty("交易金额 ")
+	@TableField(value = "trans_amount_")
+    private BigDecimal transAmount;
+    /** 
+    * 账户余额 
+    */
+    @ApiModelProperty("账户余额 ")
+	@TableField(value = "account_balance_")
+    private BigDecimal accountBalance;
+    /** 
+    * 收支类型：1、收入 2、支出 
+    */
+    @ApiModelProperty("收支类型：1、收入 2、支出 ")
+	@TableField(value = "in_or_out_")
+    private Integer inOrOut;
+    /** 
+    * 业务类型：1、陪练课 2、直播课 3、乐谱 4、提现 
+    */
+    @ApiModelProperty("业务类型：1、陪练课 2、直播课 3、乐谱 4、提现 ")
+	@TableField(value = "biz_type_")
+    private Integer bizType;
+    /** 
+    * 业务id 
+    */
+    @ApiModelProperty("业务id ")
+	@TableField(value = "biz_id_")
+    private Long bizId;
+    /** 
+    * 业务名称 
+    */
+    @ApiModelProperty("业务名称 ")
+	@TableField(value = "biz_name_")
+    private String bizName;
+    /** 
+    * 订单id 
+    */
+    @ApiModelProperty("订单id ")
+	@TableField(value = "order_id_")
+    private Long orderId;
+    /** 
+    * 创建时间 
+    */
+    @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;
+
+    @Override
+    public String toString() {
+        return "UserAccountRecord{" +
+				"id=" + id +
+						",transAmount='" + transAmount + "'" + 
+						",accountBalance='" + accountBalance + "'" + 
+						",inOrOut='" + inOrOut + "'" + 
+						",bizType='" + bizType + "'" + 
+						",bizId='" + bizId + "'" + 
+						",bizName='" + bizName + "'" + 
+						",orderId='" + orderId + "'" + 
+						",createTime='" + createTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,110 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 老师绑卡记录表
+ */
+@Data
+@TableName("user_bank_card")
+@ApiModel(value = "UserBankCard对象", description = "老师绑卡记录表")
+public class UserBankCard implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * id 
+    */
+    @ApiModelProperty("id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 用户表id 
+    */
+    @ApiModelProperty("用户表id ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 持卡人姓名 
+    */
+    @ApiModelProperty("持卡人姓名 ")
+	@TableField(value = "name_")
+    private String name;
+    /** 
+    * 开户行 
+    */
+    @ApiModelProperty("开户行 ")
+	@TableField(value = "bank_name_")
+    private String bankName;
+    /** 
+    * 银行卡号 
+    */
+    @ApiModelProperty("银行卡号 ")
+	@TableField(value = "bank_card_")
+    private String bankCard;
+    /** 
+    * 银行预留手机号 
+    */
+    @ApiModelProperty("银行预留手机号 ")
+	@TableField(value = "phone_")
+    private String phone;
+    /** 
+    * 开户行编码 
+    */
+    @ApiModelProperty("开户行编码 ")
+	@TableField(value = "bank_code_")
+    private String bankCode;
+    /** 
+    * 逻辑删除 
+    */
+    @ApiModelProperty("逻辑删除 ")
+	@TableField(value = "del_flag_")
+    @TableLogic
+    private Byte delFlag;
+    /** 
+    * 是否默认 
+    */
+    @ApiModelProperty("是否默认 ")
+	@TableField(value = "is_default_")
+    private Byte isDefault;
+    /** 
+    * 创建时间 
+    */
+    @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_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+    @Override
+    public String toString() {
+        return "UserBankCard{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",name='" + name + "'" + 
+						",bankName='" + bankName + "'" + 
+						",bankCard='" + bankCard + "'" + 
+						",phone='" + phone + "'" + 
+						",bankCode='" + bankCode + "'" + 
+						",delFlag='" + delFlag + "'" + 
+						",isDefault='" + isDefault + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,104 +1,95 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(vip_card):
+ * 会员卡表
  */
-public class VipCard {
-
-	@ApiModelProperty(value = "会员卡id",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "用户id",required = false)
-	private Long userId;
-	
-	@ApiModelProperty(value = "订单id",required = false)
-	private Long orderId;
-	
-	@ApiModelProperty(value = "时长类型：1、月卡 2、季卡 3、年卡",required = false)
-	private Integer timeType;
-	
-	@ApiModelProperty(value = "会员卡开始时间",required = false)
-	private java.util.Date startTime;
-	
-	@ApiModelProperty(value = "创建时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "更新时间",required = false)
-	private java.util.Date updateTime;
-	
-	@ApiModelProperty(value = "会员卡结束时间",required = false)
-	private java.util.Date endTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setOrderId(Long orderId){
-		this.orderId = orderId;
-	}
-	
-	public Long getOrderId(){
-		return this.orderId;
-	}
-			
-	public void setTimeType(Integer timeType){
-		this.timeType = timeType;
-	}
-	
-	public Integer getTimeType(){
-		return this.timeType;
-	}
-			
-	public void setStartTime(java.util.Date startTime){
-		this.startTime = startTime;
-	}
-	
-	public java.util.Date getStartTime(){
-		return this.startTime;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setEndTime(java.util.Date endTime){
-		this.endTime = endTime;
-	}
-	
-	public java.util.Date getEndTime(){
-		return this.endTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("vip_card")
+@ApiModel(value = "VipCard对象", description = "会员卡表")
+public class VipCard implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 会员卡id 
+    */
+    @ApiModelProperty("会员卡id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 用户id 
+    */
+    @ApiModelProperty("用户id ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 订单id 
+    */
+    @ApiModelProperty("订单id ")
+	@TableField(value = "order_id_")
+    private Long orderId;
+    /** 
+    * 时长类型：1、月卡 2、季卡 3、年卡 
+    */
+    @ApiModelProperty("时长类型：1、月卡 2、季卡 3、年卡 ")
+	@TableField(value = "time_type_")
+    private Integer timeType;
+    /** 
+    * 会员卡开始时间 
+    */
+    @ApiModelProperty("会员卡开始时间 ")
+	@TableField(value = "start_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date startTime;
+    /** 
+    * 创建时间 
+    */
+    @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_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    /** 
+    * 会员卡结束时间 
+    */
+    @ApiModelProperty("会员卡结束时间 ")
+	@TableField(value = "end_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date endTime;
 
-}
+    @Override
+    public String toString() {
+        return "VipCard{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",orderId='" + orderId + "'" + 
+						",timeType='" + timeType + "'" + 
+						",startTime='" + startTime + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",endTime='" + endTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.yonge.cooleshow.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 老师认证页面
+ * @Author: liweifan
+ * @Data: 2022/3/16 10:14
+ */
+@Getter
+@AllArgsConstructor
+public enum AuthPageEnum implements BaseEnum<Integer, AuthPageEnum> {
+    ONE(1, "实名认证页面"),
+    TWO(2, "基本信息页面"),
+    THREE(3, "学历信息页面");
+
+    private Integer code;
+
+    private String msg;
+
+    @Override
+    public Integer getCode() {
+        return null;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.yonge.cooleshow.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 认证审核状态
+ *
+ * @Author: liweifan
+ * @Data: 2022/3/16 10:19
+ */
+@Getter
+@AllArgsConstructor
+public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
+    DOING(1, "审核中"),
+    PASS(2, "通过"),
+    UNPASS(3, "不通过");
+
+    private Integer code;
+
+    private String msg;
+
+    @Override
+    public Integer getCode() {
+        return null;
+    }
+}

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

@@ -0,0 +1,21 @@
+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.entity.OrderDetail;
+
+/**
+ * 平台订单表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface OrderDetailService extends IService<OrderDetail>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<OrderDetail> selectPage(IPage<OrderDetail> page, OrderDetail orderDetail);
+}

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

@@ -0,0 +1,21 @@
+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.entity.OrderRefunds;
+
+/**
+ * 用户退款表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface OrderRefundsService extends IService<OrderRefunds>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<OrderRefunds> selectPage(IPage<OrderRefunds> page, OrderRefunds orderRefunds);
+}

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

@@ -0,0 +1,21 @@
+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.entity.Order;
+
+/**
+ * 平台订单表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface OrderService extends IService<Order>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<Order> selectPage(IPage<Order> page, Order order);
+}

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

@@ -0,0 +1,21 @@
+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.entity.TeacherAuthEntryRecord;
+
+/**
+ * 老师入驻审核表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntryRecord>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<TeacherAuthEntryRecord> selectPage(IPage<TeacherAuthEntryRecord> page, TeacherAuthEntryRecord teacherAuthEntryRecord);
+}

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

@@ -0,0 +1,21 @@
+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.entity.TeacherAuthMusicianRecord;
+
+/**
+ * 老师音乐人审核表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMusicianRecord>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<TeacherAuthMusicianRecord> selectPage(IPage<TeacherAuthMusicianRecord> page, TeacherAuthMusicianRecord teacherAuthMusicianRecord);
+}

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

@@ -1,8 +1,21 @@
 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.entity.Teacher;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface TeacherService extends BaseService<Integer, Teacher> {
+/**
+ * 教师表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface TeacherService extends IService<Teacher>  {
 
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<Teacher> selectPage(IPage<Teacher> page, Teacher teacher);
 }

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

@@ -0,0 +1,21 @@
+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.entity.TeacherWithdrawal;
+
+/**
+ * 老师账户提现表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface TeacherWithdrawalService extends IService<TeacherWithdrawal>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<TeacherWithdrawal> selectPage(IPage<TeacherWithdrawal> page, TeacherWithdrawal teacherWithdrawal);
+}

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

@@ -0,0 +1,21 @@
+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.entity.UserAccountRecord;
+
+/**
+ * 老师账户流水表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface UserAccountRecordService extends IService<UserAccountRecord>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<UserAccountRecord> selectPage(IPage<UserAccountRecord> page, UserAccountRecord userAccountRecord);
+}

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

@@ -0,0 +1,21 @@
+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.entity.UserAccount;
+
+/**
+ * 老师账户表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface UserAccountService extends IService<UserAccount>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<UserAccount> selectPage(IPage<UserAccount> page, UserAccount userAccount);
+}

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

@@ -0,0 +1,21 @@
+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.entity.UserBankCard;
+
+/**
+ * 老师绑卡记录表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface UserBankCardService extends IService<UserBankCard>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<UserBankCard> selectPage(IPage<UserBankCard> page, UserBankCard userBankCard);
+}

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

@@ -1,8 +1,21 @@
 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.entity.VipCard;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VipCardService extends BaseService<Long, VipCard> {
+/**
+ * 会员卡表 服务类
+ * @author liweifan
+ * @date 2022-03-18
+ */
+public interface VipCardService extends IService<VipCard>  {
 
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-18
+     */
+    IPage<VipCard> selectPage(IPage<VipCard> page, VipCard vipCard);
 }

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.OrderDetail;
+import com.yonge.cooleshow.biz.dal.dao.OrderDetailDao;
+import com.yonge.cooleshow.biz.dal.service.OrderDetailService;
+
+
+@Service
+public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailDao, OrderDetail> implements OrderDetailService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<OrderDetail> selectPage(IPage<OrderDetail> page, OrderDetail orderDetail){
+        return page.setRecords(baseMapper.selectPage(page, orderDetail));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
+import com.yonge.cooleshow.biz.dal.dao.OrderRefundsDao;
+import com.yonge.cooleshow.biz.dal.service.OrderRefundsService;
+
+
+@Service
+public class OrderRefundsServiceImpl extends ServiceImpl<OrderRefundsDao, OrderRefunds> implements OrderRefundsService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<OrderRefunds> selectPage(IPage<OrderRefunds> page, OrderRefunds orderRefunds){
+        return page.setRecords(baseMapper.selectPage(page, orderRefunds));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.Order;
+import com.yonge.cooleshow.biz.dal.dao.OrderDao;
+import com.yonge.cooleshow.biz.dal.service.OrderService;
+
+
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements OrderService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<Order> selectPage(IPage<Order> page, Order order){
+        return page.setRecords(baseMapper.selectPage(page, order));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
+import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
+
+
+@Service
+public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEntryRecordDao, TeacherAuthEntryRecord> implements TeacherAuthEntryRecordService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<TeacherAuthEntryRecord> selectPage(IPage<TeacherAuthEntryRecord> page, TeacherAuthEntryRecord teacherAuthEntryRecord){
+        return page.setRecords(baseMapper.selectPage(page, teacherAuthEntryRecord));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.dao.TeacherAuthMusicianRecordDao;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
+
+
+@Service
+public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAuthMusicianRecordDao, TeacherAuthMusicianRecord> implements TeacherAuthMusicianRecordService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<TeacherAuthMusicianRecord> selectPage(IPage<TeacherAuthMusicianRecord> page, TeacherAuthMusicianRecord teacherAuthMusicianRecord){
+        return page.setRecords(baseMapper.selectPage(page, teacherAuthMusicianRecord));
+    }
+	
+}

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

@@ -1,23 +1,22 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+
 
 @Service
-public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  implements TeacherService {
-	
-	@Autowired
-	private TeacherDao teacherDao;
+public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> implements TeacherService {
 
-	@Override
-	public BaseDAO<Integer, Teacher> getDAO() {
-		return teacherDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<Teacher> selectPage(IPage<Teacher> page, Teacher teacher){
+        return page.setRecords(baseMapper.selectPage(page, teacher));
+    }
 	
 }

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal;
+import com.yonge.cooleshow.biz.dal.dao.TeacherWithdrawalDao;
+import com.yonge.cooleshow.biz.dal.service.TeacherWithdrawalService;
+
+
+@Service
+public class TeacherWithdrawalServiceImpl extends ServiceImpl<TeacherWithdrawalDao, TeacherWithdrawal> implements TeacherWithdrawalService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<TeacherWithdrawal> selectPage(IPage<TeacherWithdrawal> page, TeacherWithdrawal teacherWithdrawal){
+        return page.setRecords(baseMapper.selectPage(page, teacherWithdrawal));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
+import com.yonge.cooleshow.biz.dal.dao.UserAccountRecordDao;
+import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
+
+
+@Service
+public class UserAccountRecordServiceImpl extends ServiceImpl<UserAccountRecordDao, UserAccountRecord> implements UserAccountRecordService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<UserAccountRecord> selectPage(IPage<UserAccountRecord> page, UserAccountRecord userAccountRecord){
+        return page.setRecords(baseMapper.selectPage(page, userAccountRecord));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.UserAccount;
+import com.yonge.cooleshow.biz.dal.dao.UserAccountDao;
+import com.yonge.cooleshow.biz.dal.service.UserAccountService;
+
+
+@Service
+public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAccount> implements UserAccountService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<UserAccount> selectPage(IPage<UserAccount> page, UserAccount userAccount){
+        return page.setRecords(baseMapper.selectPage(page, userAccount));
+    }
+	
+}

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

@@ -0,0 +1,22 @@
+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 com.yonge.cooleshow.biz.dal.entity.UserBankCard;
+import com.yonge.cooleshow.biz.dal.dao.UserBankCardDao;
+import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
+
+
+@Service
+public class UserBankCardServiceImpl extends ServiceImpl<UserBankCardDao, UserBankCard> implements UserBankCardService {
+
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<UserBankCard> selectPage(IPage<UserBankCard> page, UserBankCard userBankCard){
+        return page.setRecords(baseMapper.selectPage(page, userBankCard));
+    }
+	
+}

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

@@ -1,23 +1,22 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.service.VipCardService;
 import com.yonge.cooleshow.biz.dal.dao.VipCardDao;
+import com.yonge.cooleshow.biz.dal.service.VipCardService;
+
 
 @Service
-public class VipCardServiceImpl extends BaseServiceImpl<Long, VipCard>  implements VipCardService {
-	
-	@Autowired
-	private VipCardDao vipCardDao;
+public class VipCardServiceImpl extends ServiceImpl<VipCardDao, VipCard> implements VipCardService {
 
-	@Override
-	public BaseDAO<Long, VipCard> getDAO() {
-		return vipCardDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VipCard> selectPage(IPage<VipCard> page, VipCard vipCard){
+        return page.setRecords(baseMapper.selectPage(page, vipCard));
+    }
 	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/BaseEntityWrapper.java

@@ -0,0 +1,44 @@
+package com.yonge.cooleshow.biz.dal.support;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 视图包装基类
+ *
+ * @author Chill
+ */
+public abstract class BaseEntityWrapper<E, V> {
+
+	/**
+	 * 单个实体类包装
+	 * @param entity
+	 * @return
+	 */
+	public abstract V entityVO(E entity);
+
+	/**
+	 * 实体类集合包装
+	 * @param list
+	 * @return
+	 */
+	public List<V> listVO(List<E> list) {
+		return list.stream().map(this::entityVO).collect(Collectors.toList());
+	}
+
+	/**
+	 * 分页实体类集合包装
+	 * @param pages
+	 * @return
+	 */
+	public IPage<V> pageVO(IPage<E> pages) {
+		List<V> records = listVO(pages.getRecords());
+		IPage<V> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+		pageVo.setRecords(records);
+		return pageVo;
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/BasePage.java

@@ -0,0 +1,54 @@
+package com.yonge.cooleshow.biz.dal.support;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 分页模型
+ *
+ * @author Chill
+ */
+@Data
+public class BasePage<T> implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 查询数据列表
+	 */
+	private List<T> records = Collections.emptyList();
+
+	/**
+	 * 总数
+	 */
+	private long total = 0;
+	/**
+	 * 每页显示条数，默认 10
+	 */
+	private long size = 10;
+
+	/**
+	 * 当前页
+	 */
+	private long current = 1;
+
+	/**
+	 * mybatis-plus分页模型转化
+	 *
+	 * @param page 分页实体类
+	 * @return BasePage<T>
+	 */
+	public static <T> BasePage<T> of(IPage<T> page) {
+		BasePage<T> basePage = new BasePage<>();
+		basePage.setRecords(page.getRecords());
+		basePage.setTotal(page.getTotal());
+		basePage.setSize(page.getSize());
+		basePage.setCurrent(page.getCurrent());
+		return basePage;
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/Condition.java

@@ -0,0 +1,64 @@
+package com.yonge.cooleshow.biz.dal.support;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yonge.toolset.utils.string.StringUtil;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Map;
+
+/**
+ * 分页工具
+ *
+ * @author Chill
+ */
+public class Condition {
+	private static Integer toInt(Integer num,Integer bak){
+		if(null == num || 0 == num){
+			return bak;
+		}
+		return num;
+	}
+	/**
+	 * 转化成mybatis plus中的Page
+	 *
+	 * @param query 查询条件
+	 * @return IPage
+	 */
+	public static <T> IPage<T> getPage(Query query) {
+		Page<T> page = new Page<>(toInt(query.getCurrent(),1), toInt(query.getCurrent(),10));
+		page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getAscs())));
+		page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getDescs())));
+		return page;
+	}
+
+	/**
+	 * 获取mybatis plus中的QueryWrapper
+	 *
+	 * @param entity 实体
+	 * @param <T>    类型
+	 * @return QueryWrapper
+	 */
+	public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
+		return new QueryWrapper<>(entity);
+	}
+
+	/**
+	 * 获取mybatis plus中的QueryWrapper
+	 *
+	 * @param query   查询条件
+	 * @param exclude 排除的查询条件
+	 * @param clazz   实体类
+	 * @param <T>     类型
+	 * @return QueryWrapper
+	 */
+	public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> query.remove(k));
+		QueryWrapper<T> qw = new QueryWrapper<>();
+		qw.setEntity(BeanUtils.instantiateClass(clazz));
+		SqlKeyword.buildCondition(query, qw);
+		return qw;
+	}
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/Query.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.support;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 分页工具
+ *
+ * @author Chill
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(description = "查询条件")
+public class Query {
+
+	/**
+	 * 当前页
+	 */
+	@ApiModelProperty(value = "当前页")
+	private Integer current;
+
+	/**
+	 * 每页的数量
+	 */
+	@ApiModelProperty(value = "每页的数量")
+	private Integer size;
+
+	/**
+	 * 正排序规则
+	 */
+	@ApiModelProperty(hidden = true)
+	private String ascs;
+
+	/**
+	 * 倒排序规则
+	 */
+	@ApiModelProperty(hidden = true)
+	private String descs;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/SqlKeyword.java

@@ -0,0 +1,129 @@
+package com.yonge.cooleshow.biz.dal.support;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.yonge.toolset.utils.date.DateUtil;
+import com.yonge.toolset.utils.obj.ObjectUtil;
+import com.yonge.toolset.utils.string.StringUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Map;
+
+/**
+ * 定义常用的 sql关键字
+ *
+ * @author Chill
+ */
+@Component
+public class SqlKeyword {
+	private final static String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
+
+	private static final String EQUAL = "_equal";
+	private static final String NOT_EQUAL = "_notequal";
+	private static final String LIKE = "_like";
+	private static final String LIKE_LEFT = "_likeleft";
+	private static final String LIKE_RIGHT = "_likeright";
+	private static final String NOT_LIKE = "_notlike";
+	private static final String GE = "_ge";
+	private static final String LE = "_le";
+	private static final String GT = "_gt";
+	private static final String LT = "_lt";
+	private static final String DATE_GE = "_datege";
+	private static final String DATE_GT = "_dategt";
+	private static final String DATE_EQUAL = "_dateequal";
+	private static final String DATE_LT = "_datelt";
+	private static final String DATE_LE = "_datele";
+	private static final String IS_NULL = "_null";
+	private static final String NOT_NULL = "_notnull";
+	private static final String IGNORE = "_ignore";
+	//是否转驼峰
+	static public Boolean underline;
+
+	/**
+	 * 条件构造器
+	 *
+	 * @param query 查询字段
+	 * @param qw    查询包装类
+	 */
+	public static void buildCondition(Map<String, Object> query, QueryWrapper<?> qw) {
+		if (CollectionUtils.isEmpty(query)) {
+			return;
+		}
+		query.forEach((k, v) -> {
+			if (ObjectUtil.hasEmpty(k, v) || k.endsWith(IGNORE)) {
+				return;
+			}
+			if (k.endsWith(EQUAL)) {
+				qw.eq(getColumn(k, EQUAL), v);
+			} else if (k.endsWith(NOT_EQUAL)) {
+				qw.ne(getColumn(k, NOT_EQUAL), v);
+			} else if (k.endsWith(LIKE_LEFT)) {
+				qw.likeLeft(getColumn(k, LIKE_LEFT), v);
+			} else if (k.endsWith(LIKE_RIGHT)) {
+				qw.likeRight(getColumn(k, LIKE_RIGHT), v);
+			} else if (k.endsWith(NOT_LIKE)) {
+				qw.notLike(getColumn(k, NOT_LIKE), v);
+			} else if (k.endsWith(GE)) {
+				qw.ge(getColumn(k, GE), v);
+			} else if (k.endsWith(LE)) {
+				qw.le(getColumn(k, LE), v);
+			} else if (k.endsWith(GT)) {
+				qw.gt(getColumn(k, GT), v);
+			} else if (k.endsWith(LT)) {
+				qw.lt(getColumn(k, LT), v);
+			} else if (k.endsWith(DATE_GE)) {
+				qw.ge(getColumn(k, DATE_GE), DateUtil.parse(String.valueOf(v), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+			} else if (k.endsWith(DATE_GT)) {
+				qw.gt(getColumn(k, DATE_GT), DateUtil.parse(String.valueOf(v), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+			} else if (k.endsWith(DATE_EQUAL)) {
+				qw.eq(getColumn(k, DATE_EQUAL), DateUtil.parse(String.valueOf(v), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+			} else if (k.endsWith(DATE_LE)) {
+				qw.le(getColumn(k, DATE_LE), DateUtil.parse(String.valueOf(v), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+			} else if (k.endsWith(DATE_LT)) {
+				qw.lt(getColumn(k, DATE_LT), DateUtil.parse(String.valueOf(v), DateUtil.EXPANDED_DATE_TIME_FORMAT));
+			} else if (k.endsWith(IS_NULL)) {
+				qw.isNull(getColumn(k, IS_NULL));
+			} else if (k.endsWith(NOT_NULL)) {
+				qw.isNotNull(getColumn(k, NOT_NULL));
+			} else {
+				qw.like(getColumn(k, LIKE), v);
+			}
+		});
+	}
+
+	/**
+	 * 获取数据库字段
+	 *
+	 * @param column  字段名
+	 * @param keyword 关键字
+	 * @return
+	 */
+	private static String getColumn(String column, String keyword) {
+		if(underline){
+			return StringUtil.humpToUnderline(StringUtil.removeSuffix(column, keyword));
+		}else{
+			return StringUtil.removeSuffix(column, keyword);
+		}
+	}
+
+	/**
+	 * 把SQL关键字替换为空字符串
+	 *
+	 * @param param 关键字
+	 * @return string
+	 */
+	public static String filter(String param) {
+		if (param == null) {
+			return null;
+		}
+		return param.replaceAll("(?i)" + SQL_REGEX, StringPool.EMPTY);
+	}
+
+	@Value("${spring.datasource.table-underline}")
+	public void setUnderline(Boolean underline) {
+		SqlKeyword.underline = underline;
+	}
+
+}

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

@@ -0,0 +1,21 @@
+<?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="global">
+
+	<sql id="limit">
+		<if test="offset != null">
+			 limit #{offset},#{rows}
+		</if>
+	</sql>
+
+	<sql id="orderby">
+		<if test="sort != null and sort != ''">
+			 ORDER BY ${sort}
+			 <if test="order != null and order != ''">
+			 	${order}
+			 </if>
+		</if>
+	</sql>	
+ </mapper>

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

@@ -0,0 +1,29 @@
+<?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.OrderDetailDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.OrderDetail">
+            <result column="id_" property="id" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="biz_id_" property="bizId" />
+	        <result column="biz_content_" property="bizContent" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.order_no_
+        , t.biz_id_
+        , t.biz_content_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM order_detail t
+	</select>
+</mapper>

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

@@ -0,0 +1,67 @@
+<?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.OrderDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.Order">
+            <result column="id_" property="id" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="user_id_" property="userId" />
+	        <result column="merch_id_" property="merchId" />
+	        <result column="order_name_" property="orderName" />
+	        <result column="order_desc_" property="orderDesc" />
+	        <result column="status_" property="status" />
+	        <result column="original_price_" property="originalPrice" />
+	        <result column="expect_price_" property="expectPrice" />
+	        <result column="actual_price_" property="actualPrice" />
+	        <result column="coupon_amount_" property="couponAmount" />
+	        <result column="plantform_fee_" property="plantformFee" />
+	        <result column="plantform_fee_rate_" property="plantformFeeRate" />
+	        <result column="refund_amount_" property="refundAmount" />
+	        <result column="user_note_" property="userNote" />
+	        <result column="order_type_" property="orderType" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="pay_time_" property="payTime" />
+	        <result column="refund_time_" property="refundTime" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="trans_no_" property="transNo" />
+	        <result column="pay_channel_" property="payChannel" />
+	        <result column="pay_amt_" property="payAmt" />
+	        <result column="arrival_time_" property="arrivalTime" />
+	        <result column="pay_fail_msg_" property="payFailMsg" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.order_no_
+        , t.user_id_
+        , t.merch_id_
+        , t.order_name_
+        , t.order_desc_
+        , t.status_
+        , t.original_price_
+        , t.expect_price_
+        , t.actual_price_
+        , t.coupon_amount_
+        , t.plantform_fee_
+        , t.plantform_fee_rate_
+        , t.refund_amount_
+        , t.user_note_
+        , t.order_type_
+        , t.create_time_
+        , t.pay_time_
+        , t.refund_time_
+        , t.update_time_
+        , t.trans_no_
+        , t.pay_channel_
+        , t.pay_amt_
+        , t.arrival_time_
+        , t.pay_fail_msg_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM order t
+	</select>
+</mapper>

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

@@ -0,0 +1,39 @@
+<?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.OrderRefundsDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.OrderRefunds">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="status_" property="status" />
+	        <result column="apply_amount_" property="applyAmount" />
+	        <result column="actual_amount_" property="actualAmount" />
+	        <result column="reason_" property="reason" />
+	        <result column="operate_user_id_" property="operateUserId" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="remark_" property="remark" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.order_no_
+        , t.status_
+        , t.apply_amount_
+        , t.actual_amount_
+        , t.reason_
+        , t.operate_user_id_
+        , t.create_time_
+        , t.update_time_
+        , t.remark_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM order_refunds t
+	</select>
+</mapper>

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

@@ -0,0 +1,45 @@
+<?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.TeacherAuthEntryRecordDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="subject_id_" property="subjectId" />
+	        <result column="introduction_" property="introduction" />
+	        <result column="graduate_school_" property="graduateSchool" />
+	        <result column="subject_" property="subject" />
+	        <result column="grad_certificate_" property="gradCertificate" />
+	        <result column="degree__certificate_" property="degreeCertificate" />
+	        <result column="teacher__certificate_" property="teacherCertificate" />
+	        <result column="teacher_auth_status_" property="teacherAuthStatus" />
+	        <result column="verify_user_id_" property="verifyUserId" />
+	        <result column="reason_" property="reason" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.subject_id_
+        , t.introduction_
+        , t.graduate_school_
+        , t.subject_
+        , t.grad_certificate_
+        , t.degree__certificate_
+        , t.teacher__certificate_
+        , t.teacher_auth_status_
+        , t.verify_user_id_
+        , t.reason_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM teacher_auth_entry_record t
+	</select>
+</mapper>

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

@@ -0,0 +1,31 @@
+<?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.TeacherAuthMusicianRecordDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="teacher_auth_status_" property="teacherAuthStatus" />
+	        <result column="verify_user_id_" property="verifyUserId" />
+	        <result column="reason_" property="reason" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.teacher_auth_status_
+        , t.verify_user_id_
+        , t.reason_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM teacher_auth_musician_record t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.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.TeacherDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.Teacher">
+            <result column="user_id_" property="userId" />
+	        <result column="education_background_" property="educationBackground" />
+	        <result column="graduate_school_" property="graduateSchool" />
+	        <result column="technical_titles_" property="technicalTitles" />
+	        <result column="work_unit_" property="workUnit" />
+	        <result column="subject_id_" property="subjectId" />
+	        <result column="entry_status_" property="entryStatus" />
+	        <result column="entry_auth_date_" property="entryAuthDate" />
+	        <result column="introduction_" property="introduction" />
+	        <result column="musician_auth_status_" property="musicianAuthStatus" />
+	        <result column="musician_date_" property="musicianDate" />
+	        <result column="subject_" property="subject" />
+	        <result column="grad_certificate_" property="gradCertificate" />
+	        <result column="degree__certificate_" property="degreeCertificate" />
+	        <result column="teacher__certificate_" property="teacherCertificate" />
+	        <result column="memo_" property="memo" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.user_id_
+        , t.education_background_
+        , t.graduate_school_
+        , t.technical_titles_
+        , t.work_unit_
+        , t.subject_id_
+        , t.entry_status_
+        , t.entry_auth_date_
+        , t.introduction_
+        , t.musician_auth_status_
+        , t.musician_date_
+        , t.subject_
+        , t.grad_certificate_
+        , t.degree__certificate_
+        , t.teacher__certificate_
+        , t.memo_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM teacher t
+	</select>
+</mapper>

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

@@ -0,0 +1,43 @@
+<?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.TeacherWithdrawalDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="user_account_record_id_" property="userAccountRecordId" />
+	        <result column="amount_" property="amount" />
+	        <result column="plantform_fee_" property="plantformFee" />
+	        <result column="actual_amount_" property="actualAmount" />
+	        <result column="bank_card_" property="bankCard" />
+	        <result column="bank_name_" property="bankName" />
+	        <result column="bank_flow_no_" property="bankFlowNo" />
+	        <result column="transfer_time_" property="transferTime" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="status_" property="status" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.user_account_record_id_
+        , t.amount_
+        , t.plantform_fee_
+        , t.actual_amount_
+        , t.bank_card_
+        , t.bank_name_
+        , t.bank_flow_no_
+        , t.transfer_time_
+        , t.create_time_
+        , t.update_time_
+        , t.status_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM teacher_withdrawal t
+	</select>
+</mapper>

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

@@ -0,0 +1,31 @@
+<?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.UserAccountDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.UserAccount">
+            <result column="user_id_" property="userId" />
+	        <result column="amount_total" property="amountTotal" />
+	        <result column="amount_usable" property="amountUsable" />
+	        <result column="amount_frozen" property="amountFrozen" />
+	        <result column="status_" property="status" />
+	        <result column="create_time" property="createTime" />
+	        <result column="update_time" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.user_id_
+        , t.amount_total
+        , t.amount_usable
+        , t.amount_frozen
+        , t.status_
+        , t.create_time
+        , t.update_time
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM user_account t
+	</select>
+</mapper>

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

@@ -0,0 +1,35 @@
+<?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.UserAccountRecordDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.UserAccountRecord">
+            <result column="id_" property="id" />
+	        <result column="trans_amount_" property="transAmount" />
+	        <result column="account_balance_" property="accountBalance" />
+	        <result column="in_or_out_" property="inOrOut" />
+	        <result column="biz_type_" property="bizType" />
+	        <result column="biz_id_" property="bizId" />
+	        <result column="biz_name_" property="bizName" />
+	        <result column="order_id_" property="orderId" />
+	        <result column="create_time_" property="createTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.trans_amount_
+        , t.account_balance_
+        , t.in_or_out_
+        , t.biz_type_
+        , t.biz_id_
+        , t.biz_name_
+        , t.order_id_
+        , t.create_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM user_account_record t
+	</select>
+</mapper>

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

@@ -0,0 +1,39 @@
+<?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.UserBankCardDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.UserBankCard">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="name_" property="name" />
+	        <result column="bank_name_" property="bankName" />
+	        <result column="bank_card_" property="bankCard" />
+	        <result column="phone_" property="phone" />
+	        <result column="bank_code_" property="bankCode" />
+	        <result column="del_flag_" property="delFlag" />
+	        <result column="is_default_" property="isDefault" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.name_
+        , t.bank_name_
+        , t.bank_card_
+        , t.phone_
+        , t.bank_code_
+        , t.del_flag_
+        , t.is_default_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM user_bank_card t
+	</select>
+</mapper>

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

@@ -0,0 +1,33 @@
+<?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.VipCardDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VipCard">
+            <result column="id_" property="id" />
+	        <result column="user_id_" property="userId" />
+	        <result column="order_id_" property="orderId" />
+	        <result column="time_type_" property="timeType" />
+	        <result column="start_time_" property="startTime" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="end_time_" property="endTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.order_id_
+        , t.time_type_
+        , t.start_time_
+        , t.create_time_
+        , t.update_time_
+        , t.end_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM vip_card t
+	</select>
+</mapper>

cooleshow-user/user-teacher/pom.xml

@@ -1,82 +1,82 @@
 <?xml version="1.0"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.yonge.cooleshow</groupId>
-		<artifactId>cooleshow-user</artifactId>
-		<version>1.0</version>
-	</parent>
-	<groupId>com.yonge.cooleshow</groupId>
-	<artifactId>user-teacher</artifactId>
-	<version>1.0</version>
-	<name>user-teacher</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.yonge.cooleshow</groupId>
+        <artifactId>cooleshow-user</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>user-teacher</artifactId>
+    <version>1.0</version>
+    <name>user-teacher</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-security</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
 
-		<!-- swagger-spring-boot -->
-		<dependency>
-			<groupId>com.spring4all</groupId>
-			<artifactId>swagger-spring-boot-starter</artifactId>
-		</dependency>
+        <!-- swagger-spring-boot -->
+        <dependency>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.toolset</groupId>
-			<artifactId>audit-log</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>audit-log</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.toolset</groupId>
-			<artifactId>thirdparty-component</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>thirdparty-component</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.cooleshow</groupId>
-			<artifactId>user-biz</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>user-biz</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.github.whvcse</groupId>
-			<artifactId>easy-captcha</artifactId>
-			<version>1.6.2</version>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.github.whvcse</groupId>
+            <artifactId>easy-captcha</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/TeacherApplication.java

@@ -1,8 +1,13 @@
 package com.yonge.cooleshow.teacher;
 
+import com.spring4all.swagger.EnableSwagger2Doc;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * @Author: liweifan
@@ -10,6 +15,11 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  */
 @SpringBootApplication
 @EnableDiscoveryClient
+@EnableFeignClients("com.yonge.cooleshow")
+@MapperScan("com.yonge.cooleshow.biz.dal.dao")
+@ComponentScan(basePackages = { "com.yonge.cooleshow.teacher", "com.yonge.cooleshow.auth", "com.yonge.cooleshow.biz", "com.yonge.cooleshow.common", "com.yonge.cooleshow.common.security", "com.yonge.toolset.log", "com.yonge.toolset.thirdparty" })
+@Configuration
+@EnableSwagger2Doc
 public class TeacherApplication {
     public static void main(String[] args) {
         SpringApplication.run(TeacherApplication.class, args);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.Order;
+import com.yonge.cooleshow.biz.dal.service.OrderService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/Order")
+@Api(value = "平台订单表", tags = "平台订单表")
+public class OrderController extends BaseController {
+
+    @Autowired
+    private OrderService orderService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入order")
+    public HttpResponseResult<Order> detail(Order order) {
+		Order detail = orderService.getOne(Condition.getQueryWrapper(order));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入order")
+    public HttpResponseResult<List<Order>> list(Order order) {
+		List<Order> list = orderService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入order")
+    public HttpResponseResult<IPage<Order>> page(Order order, Query query) {
+		IPage<Order> pages = orderService.selectPage(Condition.getPage(query), order);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入order")
+	public HttpResponseResult save(@Valid @RequestBody Order order) {
+    	return status(orderService.save(order));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入order")
+	public HttpResponseResult update(@Valid @RequestBody Order order) {
+        return status(orderService.updateById(order));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入order")
+	public HttpResponseResult submit(@RequestBody Order order) {
+        return status(orderService.saveOrUpdate(order));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(orderService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderDetailController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.OrderDetail;
+import com.yonge.cooleshow.biz.dal.service.OrderDetailService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/OrderDetail")
+@Api(value = "平台订单表", tags = "平台订单表")
+public class OrderDetailController extends BaseController {
+
+    @Autowired
+    private OrderDetailService orderDetailService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入orderDetail")
+    public HttpResponseResult<OrderDetail> detail(OrderDetail orderDetail) {
+		OrderDetail detail = orderDetailService.getOne(Condition.getQueryWrapper(orderDetail));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入orderDetail")
+    public HttpResponseResult<List<OrderDetail>> list(OrderDetail orderDetail) {
+		List<OrderDetail> list = orderDetailService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderDetail")
+    public HttpResponseResult<IPage<OrderDetail>> page(OrderDetail orderDetail, Query query) {
+		IPage<OrderDetail> pages = orderDetailService.selectPage(Condition.getPage(query), orderDetail);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入orderDetail")
+	public HttpResponseResult save(@Valid @RequestBody OrderDetail orderDetail) {
+    	return status(orderDetailService.save(orderDetail));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入orderDetail")
+	public HttpResponseResult update(@Valid @RequestBody OrderDetail orderDetail) {
+        return status(orderDetailService.updateById(orderDetail));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入orderDetail")
+	public HttpResponseResult submit(@RequestBody OrderDetail orderDetail) {
+        return status(orderDetailService.saveOrUpdate(orderDetail));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(orderDetailService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderRefundsController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
+import com.yonge.cooleshow.biz.dal.service.OrderRefundsService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/OrderRefunds")
+@Api(value = "用户退款表", tags = "用户退款表")
+public class OrderRefundsController extends BaseController {
+
+    @Autowired
+    private OrderRefundsService orderRefundsService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入orderRefunds")
+    public HttpResponseResult<OrderRefunds> detail(OrderRefunds orderRefunds) {
+		OrderRefunds detail = orderRefundsService.getOne(Condition.getQueryWrapper(orderRefunds));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入orderRefunds")
+    public HttpResponseResult<List<OrderRefunds>> list(OrderRefunds orderRefunds) {
+		List<OrderRefunds> list = orderRefundsService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderRefunds")
+    public HttpResponseResult<IPage<OrderRefunds>> page(OrderRefunds orderRefunds, Query query) {
+		IPage<OrderRefunds> pages = orderRefundsService.selectPage(Condition.getPage(query), orderRefunds);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入orderRefunds")
+	public HttpResponseResult save(@Valid @RequestBody OrderRefunds orderRefunds) {
+    	return status(orderRefundsService.save(orderRefunds));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入orderRefunds")
+	public HttpResponseResult update(@Valid @RequestBody OrderRefunds orderRefunds) {
+        return status(orderRefundsService.updateById(orderRefunds));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入orderRefunds")
+	public HttpResponseResult submit(@RequestBody OrderRefunds orderRefunds) {
+        return status(orderRefundsService.saveOrUpdate(orderRefunds));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(orderRefundsService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthEntryRecordController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/TeacherAuthEntryRecord")
+@Api(value = "老师入驻审核表", tags = "老师入驻审核表")
+public class TeacherAuthEntryRecordController extends BaseController {
+
+    @Autowired
+    private TeacherAuthEntryRecordService teacherAuthEntryRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<TeacherAuthEntryRecord> detail(TeacherAuthEntryRecord teacherAuthEntryRecord) {
+		TeacherAuthEntryRecord detail = teacherAuthEntryRecordService.getOne(Condition.getQueryWrapper(teacherAuthEntryRecord));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<List<TeacherAuthEntryRecord>> list(TeacherAuthEntryRecord teacherAuthEntryRecord) {
+		List<TeacherAuthEntryRecord> list = teacherAuthEntryRecordService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<IPage<TeacherAuthEntryRecord>> page(TeacherAuthEntryRecord teacherAuthEntryRecord, Query query) {
+		IPage<TeacherAuthEntryRecord> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), teacherAuthEntryRecord);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入teacherAuthEntryRecord")
+	public HttpResponseResult save(@Valid @RequestBody TeacherAuthEntryRecord teacherAuthEntryRecord) {
+    	return status(teacherAuthEntryRecordService.save(teacherAuthEntryRecord));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入teacherAuthEntryRecord")
+	public HttpResponseResult update(@Valid @RequestBody TeacherAuthEntryRecord teacherAuthEntryRecord) {
+        return status(teacherAuthEntryRecordService.updateById(teacherAuthEntryRecord));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入teacherAuthEntryRecord")
+	public HttpResponseResult submit(@RequestBody TeacherAuthEntryRecord teacherAuthEntryRecord) {
+        return status(teacherAuthEntryRecordService.saveOrUpdate(teacherAuthEntryRecord));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(teacherAuthEntryRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthMusicianRecordController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/TeacherAuthMusicianRecord")
+@Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
+public class TeacherAuthMusicianRecordController extends BaseController {
+
+    @Autowired
+    private TeacherAuthMusicianRecordService teacherAuthMusicianRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入teacherAuthMusicianRecord")
+    public HttpResponseResult<TeacherAuthMusicianRecord> detail(TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
+		TeacherAuthMusicianRecord detail = teacherAuthMusicianRecordService.getOne(Condition.getQueryWrapper(teacherAuthMusicianRecord));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入teacherAuthMusicianRecord")
+    public HttpResponseResult<List<TeacherAuthMusicianRecord>> list(TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
+		List<TeacherAuthMusicianRecord> list = teacherAuthMusicianRecordService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacherAuthMusicianRecord")
+    public HttpResponseResult<IPage<TeacherAuthMusicianRecord>> page(TeacherAuthMusicianRecord teacherAuthMusicianRecord, Query query) {
+		IPage<TeacherAuthMusicianRecord> pages = teacherAuthMusicianRecordService.selectPage(Condition.getPage(query), teacherAuthMusicianRecord);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入teacherAuthMusicianRecord")
+	public HttpResponseResult save(@Valid @RequestBody TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
+    	return status(teacherAuthMusicianRecordService.save(teacherAuthMusicianRecord));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入teacherAuthMusicianRecord")
+	public HttpResponseResult update(@Valid @RequestBody TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
+        return status(teacherAuthMusicianRecordService.updateById(teacherAuthMusicianRecord));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入teacherAuthMusicianRecord")
+	public HttpResponseResult submit(@RequestBody TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
+        return status(teacherAuthMusicianRecordService.saveOrUpdate(teacherAuthMusicianRecord));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(teacherAuthMusicianRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/Teacher")
+@Api(value = "教师表", tags = "教师表")
+public class TeacherController extends BaseController {
+
+    @Autowired
+    private TeacherService teacherService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入teacher")
+    public HttpResponseResult<Teacher> detail(Teacher teacher) {
+		Teacher detail = teacherService.getOne(Condition.getQueryWrapper(teacher));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入teacher")
+    public HttpResponseResult<List<Teacher>> list(Teacher teacher) {
+		List<Teacher> list = teacherService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacher")
+    public HttpResponseResult<IPage<Teacher>> page(Teacher teacher, Query query) {
+		IPage<Teacher> pages = teacherService.selectPage(Condition.getPage(query), teacher);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入teacher")
+	public HttpResponseResult save(@Valid @RequestBody Teacher teacher) {
+    	return status(teacherService.save(teacher));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入teacher")
+	public HttpResponseResult update(@Valid @RequestBody Teacher teacher) {
+        return status(teacherService.updateById(teacher));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入teacher")
+	public HttpResponseResult submit(@RequestBody Teacher teacher) {
+        return status(teacherService.saveOrUpdate(teacher));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(teacherService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherWithdrawalController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal;
+import com.yonge.cooleshow.biz.dal.service.TeacherWithdrawalService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/TeacherWithdrawal")
+@Api(value = "老师账户提现表", tags = "老师账户提现表")
+public class TeacherWithdrawalController extends BaseController {
+
+    @Autowired
+    private TeacherWithdrawalService teacherWithdrawalService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入teacherWithdrawal")
+    public HttpResponseResult<TeacherWithdrawal> detail(TeacherWithdrawal teacherWithdrawal) {
+		TeacherWithdrawal detail = teacherWithdrawalService.getOne(Condition.getQueryWrapper(teacherWithdrawal));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入teacherWithdrawal")
+    public HttpResponseResult<List<TeacherWithdrawal>> list(TeacherWithdrawal teacherWithdrawal) {
+		List<TeacherWithdrawal> list = teacherWithdrawalService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacherWithdrawal")
+    public HttpResponseResult<IPage<TeacherWithdrawal>> page(TeacherWithdrawal teacherWithdrawal, Query query) {
+		IPage<TeacherWithdrawal> pages = teacherWithdrawalService.selectPage(Condition.getPage(query), teacherWithdrawal);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入teacherWithdrawal")
+	public HttpResponseResult save(@Valid @RequestBody TeacherWithdrawal teacherWithdrawal) {
+    	return status(teacherWithdrawalService.save(teacherWithdrawal));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入teacherWithdrawal")
+	public HttpResponseResult update(@Valid @RequestBody TeacherWithdrawal teacherWithdrawal) {
+        return status(teacherWithdrawalService.updateById(teacherWithdrawal));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入teacherWithdrawal")
+	public HttpResponseResult submit(@RequestBody TeacherWithdrawal teacherWithdrawal) {
+        return status(teacherWithdrawalService.saveOrUpdate(teacherWithdrawal));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(teacherWithdrawalService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.UserAccount;
+import com.yonge.cooleshow.biz.dal.service.UserAccountService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/UserAccount")
+@Api(value = "老师账户表", tags = "老师账户表")
+public class UserAccountController extends BaseController {
+
+    @Autowired
+    private UserAccountService userAccountService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入userAccount")
+    public HttpResponseResult<UserAccount> detail(UserAccount userAccount) {
+		UserAccount detail = userAccountService.getOne(Condition.getQueryWrapper(userAccount));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入userAccount")
+    public HttpResponseResult<List<UserAccount>> list(UserAccount userAccount) {
+		List<UserAccount> list = userAccountService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userAccount")
+    public HttpResponseResult<IPage<UserAccount>> page(UserAccount userAccount, Query query) {
+		IPage<UserAccount> pages = userAccountService.selectPage(Condition.getPage(query), userAccount);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入userAccount")
+	public HttpResponseResult save(@Valid @RequestBody UserAccount userAccount) {
+    	return status(userAccountService.save(userAccount));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入userAccount")
+	public HttpResponseResult update(@Valid @RequestBody UserAccount userAccount) {
+        return status(userAccountService.updateById(userAccount));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入userAccount")
+	public HttpResponseResult submit(@RequestBody UserAccount userAccount) {
+        return status(userAccountService.saveOrUpdate(userAccount));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(userAccountService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountRecordController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
+import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/UserAccountRecord")
+@Api(value = "老师账户流水表", tags = "老师账户流水表")
+public class UserAccountRecordController extends BaseController {
+
+    @Autowired
+    private UserAccountRecordService userAccountRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入userAccountRecord")
+    public HttpResponseResult<UserAccountRecord> detail(UserAccountRecord userAccountRecord) {
+		UserAccountRecord detail = userAccountRecordService.getOne(Condition.getQueryWrapper(userAccountRecord));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入userAccountRecord")
+    public HttpResponseResult<List<UserAccountRecord>> list(UserAccountRecord userAccountRecord) {
+		List<UserAccountRecord> list = userAccountRecordService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userAccountRecord")
+    public HttpResponseResult<IPage<UserAccountRecord>> page(UserAccountRecord userAccountRecord, Query query) {
+		IPage<UserAccountRecord> pages = userAccountRecordService.selectPage(Condition.getPage(query), userAccountRecord);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入userAccountRecord")
+	public HttpResponseResult save(@Valid @RequestBody UserAccountRecord userAccountRecord) {
+    	return status(userAccountRecordService.save(userAccountRecord));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入userAccountRecord")
+	public HttpResponseResult update(@Valid @RequestBody UserAccountRecord userAccountRecord) {
+        return status(userAccountRecordService.updateById(userAccountRecord));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入userAccountRecord")
+	public HttpResponseResult submit(@RequestBody UserAccountRecord userAccountRecord) {
+        return status(userAccountRecordService.saveOrUpdate(userAccountRecord));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(userAccountRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserBankCardController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
+import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/UserBankCard")
+@Api(value = "老师绑卡记录表", tags = "老师绑卡记录表")
+public class UserBankCardController extends BaseController {
+
+    @Autowired
+    private UserBankCardService userBankCardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入userBankCard")
+    public HttpResponseResult<UserBankCard> detail(UserBankCard userBankCard) {
+		UserBankCard detail = userBankCardService.getOne(Condition.getQueryWrapper(userBankCard));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入userBankCard")
+    public HttpResponseResult<List<UserBankCard>> list(UserBankCard userBankCard) {
+		List<UserBankCard> list = userBankCardService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userBankCard")
+    public HttpResponseResult<IPage<UserBankCard>> page(UserBankCard userBankCard, Query query) {
+		IPage<UserBankCard> pages = userBankCardService.selectPage(Condition.getPage(query), userBankCard);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入userBankCard")
+	public HttpResponseResult save(@Valid @RequestBody UserBankCard userBankCard) {
+    	return status(userBankCardService.save(userBankCard));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入userBankCard")
+	public HttpResponseResult update(@Valid @RequestBody UserBankCard userBankCard) {
+        return status(userBankCardService.updateById(userBankCard));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入userBankCard")
+	public HttpResponseResult submit(@RequestBody UserBankCard userBankCard) {
+        return status(userBankCardService.saveOrUpdate(userBankCard));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(userBankCardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VipCardController.java

@@ -0,0 +1,101 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.entity.VipCard;
+import com.yonge.cooleshow.biz.dal.service.VipCardService;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/VipCard")
+@Api(value = "会员卡表", tags = "会员卡表")
+public class VipCardController extends BaseController {
+
+    @Autowired
+    private VipCardService vipCardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入vipCard")
+    public HttpResponseResult<VipCard> detail(VipCard vipCard) {
+		VipCard detail = vipCardService.getOne(Condition.getQueryWrapper(vipCard));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入vipCard")
+    public HttpResponseResult<List<VipCard>> list(VipCard vipCard) {
+		List<VipCard> list = vipCardService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入vipCard")
+    public HttpResponseResult<IPage<VipCard>> page(VipCard vipCard, Query query) {
+		IPage<VipCard> pages = vipCardService.selectPage(Condition.getPage(query), vipCard);
+		return succeed(pages);
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入vipCard")
+	public HttpResponseResult save(@Valid @RequestBody VipCard vipCard) {
+    	return status(vipCardService.save(vipCard));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入vipCard")
+	public HttpResponseResult update(@Valid @RequestBody VipCard vipCard) {
+        return status(vipCardService.updateById(vipCard));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入vipCard")
+	public HttpResponseResult submit(@RequestBody VipCard vipCard) {
+        return status(vipCardService.saveOrUpdate(vipCard));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(vipCardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

toolset/codegen/src/main/resources/template/dao.ftl

@@ -1,7 +1,7 @@
 [#ftl]
 package ${daoPackageName};
 
-import com.yonge.cooleshow.common.dal.BaseDAO
+import com.yonge.cooleshow.common.dal.BaseDAO;
 import ${pojoFullClassName};
 
 public interface ${className}Dao [#if paramType??]extends BaseDAO<${paramType}, ${className}>[/#if] {

toolset/utils/src/main/java/com/yonge/toolset/utils/date/ConcurrentDateFormat.java

@@ -0,0 +1,71 @@
+package com.yonge.toolset.utils.date;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Queue;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * 参考tomcat8中的并发DateFormat
+ * <p>
+ * {@link SimpleDateFormat}的线程安全包装器。
+ * 不使用ThreadLocal，创建足够的SimpleDateFormat对象来满足并发性要求。
+ * </p>
+ *
+ * @author L.cm
+ */
+public class ConcurrentDateFormat {
+	private final String format;
+	private final Locale locale;
+	private final TimeZone timezone;
+	private final Queue<SimpleDateFormat> queue = new ConcurrentLinkedQueue<>();
+
+	private ConcurrentDateFormat(String format, Locale locale, TimeZone timezone) {
+		this.format = format;
+		this.locale = locale;
+		this.timezone = timezone;
+		SimpleDateFormat initial = createInstance();
+		queue.add(initial);
+	}
+
+	public static ConcurrentDateFormat of(String format) {
+		return new ConcurrentDateFormat(format, Locale.getDefault(), TimeZone.getDefault());
+	}
+
+	public static ConcurrentDateFormat of(String format, TimeZone timezone) {
+		return new ConcurrentDateFormat(format, Locale.getDefault(), timezone);
+	}
+
+	public static ConcurrentDateFormat of(String format, Locale locale, TimeZone timezone) {
+		return new ConcurrentDateFormat(format, locale, timezone);
+	}
+
+	public String format(Date date) {
+		SimpleDateFormat sdf = queue.poll();
+		if (sdf == null) {
+			sdf = createInstance();
+		}
+		String result = sdf.format(date);
+		queue.add(sdf);
+		return result;
+	}
+
+	public Date parse(String source) throws ParseException {
+		SimpleDateFormat sdf = queue.poll();
+		if (sdf == null) {
+			sdf = createInstance();
+		}
+		Date result = sdf.parse(source);
+		queue.add(sdf);
+		return result;
+	}
+
+	private SimpleDateFormat createInstance() {
+		SimpleDateFormat sdf = new SimpleDateFormat(format, locale);
+		sdf.setTimeZone(timezone);
+		return sdf;
+	}
+}

toolset/utils/src/main/java/com/yonge/toolset/utils/date/DateUtil.java

@@ -849,6 +849,22 @@ public class DateUtil {
 	}
 
 	/**
+	 * 将字符串转换为时间
+	 *
+	 * @param dateStr 时间字符串
+	 * @param pattern 表达式
+	 * @return 时间
+	 */
+	public static Date parse(String dateStr, String pattern) {
+		ConcurrentDateFormat format = ConcurrentDateFormat.of(pattern);
+		try {
+			return format.parse(dateStr);
+		} catch (ParseException e) {
+			throw Exceptions.unchecked(e);
+		}
+	}
+
+	/**
 	 * 解析毫秒时间格式
 	 *
 	 * @param millis

toolset/utils/src/main/java/com/yonge/toolset/utils/date/Exceptions.java

@@ -0,0 +1,68 @@
+package com.yonge.toolset.utils.date;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
+
+/**
+ * 异常处理工具类
+ *
+ * @author L.cm
+ */
+public class Exceptions {
+
+	/**
+	 * 将CheckedException转换为UncheckedException.
+	 *
+	 * @param e Throwable
+	 * @return {RuntimeException}
+	 */
+	public static RuntimeException unchecked(Throwable e) {
+		if (e instanceof Error) {
+			throw (Error) e;
+		} else if (e instanceof IllegalAccessException ||
+			e instanceof IllegalArgumentException ||
+			e instanceof NoSuchMethodException) {
+			return new IllegalArgumentException(e);
+		} else if (e instanceof InvocationTargetException) {
+			return new RuntimeException(((InvocationTargetException) e).getTargetException());
+		} else if (e instanceof RuntimeException) {
+			return (RuntimeException) e;
+		} else if (e instanceof InterruptedException) {
+			Thread.currentThread().interrupt();
+		}
+		return Exceptions.runtime(e);
+	}
+
+	/**
+	 * 不采用 RuntimeException 包装，直接抛出，使异常更加精准
+	 *
+	 * @param throwable Throwable
+	 * @param <T>       泛型标记
+	 * @return Throwable
+	 * @throws T 泛型
+	 */
+	@SuppressWarnings("unchecked")
+	private static <T extends Throwable> T runtime(Throwable throwable) throws T {
+		throw (T) throwable;
+	}
+
+	/**
+	 * 代理异常解包
+	 *
+	 * @param wrapped 包装过得异常
+	 * @return 解包后的异常
+	 */
+	public static Throwable unwrap(Throwable wrapped) {
+		Throwable unwrapped = wrapped;
+		while (true) {
+			if (unwrapped instanceof InvocationTargetException) {
+				unwrapped = ((InvocationTargetException) unwrapped).getTargetException();
+			} else if (unwrapped instanceof UndeclaredThrowableException) {
+				unwrapped = ((UndeclaredThrowableException) unwrapped).getUndeclaredThrowable();
+			} else {
+				return unwrapped;
+			}
+		}
+	}
+
+}

toolset/utils/src/main/java/com/yonge/toolset/utils/obj/ObjectUtil.java

@@ -0,0 +1,43 @@
+package com.yonge.toolset.utils.obj;
+
+import org.springframework.beans.BeanInstantiationException;
+import org.springframework.beans.BeanUtils;
+import org.springframework.core.KotlinDetector;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/17 17:46
+ */
+public class ObjectUtil {
+    public static boolean hasEmpty(Object... os) {
+        for (Object o : os) {
+            if (ObjectUtil.isEmpty(o)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isEmpty(@Nullable Object obj) {
+        if (obj == null) {
+            return true;
+        } else if (obj instanceof Optional) {
+            return !((Optional)obj).isPresent();
+        } else if (obj instanceof CharSequence) {
+            return ((CharSequence)obj).length() == 0;
+        } else if (obj.getClass().isArray()) {
+            return Array.getLength(obj) == 0;
+        } else if (obj instanceof Collection) {
+            return ((Collection)obj).isEmpty();
+        } else {
+            return obj instanceof Map ? ((Map)obj).isEmpty() : false;
+        }
+    }
+}

toolset/utils/src/main/java/com/yonge/toolset/utils/string/CharPool.java

@@ -0,0 +1,58 @@
+package com.yonge.toolset.utils.string;
+
+/**
+ * char 常量池
+ *
+ * @author L.cm
+ */
+public interface CharPool {
+
+	// @formatter:off
+	char UPPER_A          = 'A';
+	char LOWER_A          = 'a';
+	char UPPER_Z          = 'Z';
+	char LOWER_Z          = 'z';
+	char DOT              = '.';
+	char AT               = '@';
+	char LEFT_BRACE       = '{';
+	char RIGHT_BRACE      = '}';
+	char LEFT_BRACKET     = '(';
+	char RIGHT_BRACKET    = ')';
+	char DASH             = '-';
+	char PERCENT          = '%';
+	char PIPE             = '|';
+	char PLUS             = '+';
+	char QUESTION_MARK    = '?';
+	char EXCLAMATION_MARK = '!';
+	char EQUALS           = '=';
+	char AMPERSAND        = '&';
+	char ASTERISK         = '*';
+	char STAR             = ASTERISK;
+	char BACK_SLASH       = '\\';
+	char COLON            = ':';
+	char COMMA            = ',';
+	char DOLLAR           = '$';
+	char SLASH            = '/';
+	char HASH             = '#';
+	char HAT              = '^';
+	char LEFT_CHEV        = '<';
+	char NEWLINE          = '\n';
+	char N                = 'n';
+	char Y                = 'y';
+	char QUOTE            = '\"';
+	char RETURN           = '\r';
+	char TAB              = '\t';
+	char RIGHT_CHEV       = '>';
+	char SEMICOLON        = ';';
+	char SINGLE_QUOTE     = '\'';
+	char BACKTICK         = '`';
+	char SPACE            = ' ';
+	char TILDA            = '~';
+	char LEFT_SQ_BRACKET  = '[';
+	char RIGHT_SQ_BRACKET = ']';
+	char UNDERSCORE       = '_';
+	char ONE              = '1';
+	char ZERO             = '0';
+	// @formatter:on
+
+}

toolset/utils/src/main/java/com/yonge/toolset/utils/string/StringPool.java

@@ -0,0 +1,70 @@
+package com.yonge.toolset.utils.string;
+
+/**
+ * 静态 String 池
+ *
+ * @author L.cm
+ */
+public interface StringPool {
+
+	String AMPERSAND		= "&";
+	String AND				= "and";
+	String AT				= "@";
+	String ASTERISK			= "*";
+	String STAR				= ASTERISK;
+	String SLASH				= "/";
+	String BACK_SLASH			= "\\";
+	String DOUBLE_SLASH		= "#//";
+	String COLON			= ":";
+	String COMMA			= ",";
+	String DASH				= "-";
+	String DOLLAR			= "$";
+	String DOT				= ".";
+	String EMPTY			= "";
+	String EMPTY_JSON 		= "{}";
+	String EQUALS			= "=";
+	String FALSE			= "false";
+	String HASH				= "#";
+	String HAT				= "^";
+	String LEFT_BRACE		= "{";
+	String LEFT_BRACKET		= "(";
+	String LEFT_CHEV		= "<";
+	String NEWLINE			= "\n";
+	String N				= "n";
+	String NO				= "no";
+	String NULL				= "null";
+	String OFF				= "off";
+	String ON				= "on";
+	String PERCENT			= "%";
+	String PIPE				= "|";
+	String PLUS				= "+";
+	String QUESTION_MARK	= "?";
+	String EXCLAMATION_MARK	= "!";
+	String QUOTE			= "\"";
+	String RETURN			= "\r";
+	String TAB				= "\t";
+	String RIGHT_BRACE		= "}";
+	String RIGHT_BRACKET	= ")";
+	String RIGHT_CHEV		= ">";
+	String SEMICOLON		= ";";
+	String SINGLE_QUOTE		= "'";
+	String BACKTICK			= "`";
+	String SPACE			= " ";
+	String TILDA			= "~";
+	String LEFT_SQ_BRACKET	= "[";
+	String RIGHT_SQ_BRACKET	= "]";
+	String TRUE				= "true";
+	String UNDERSCORE		= "_";
+	String UTF_8			= "UTF-8";
+	String GBK				= "GBK";
+	String ISO_8859_1 		= "ISO-8859-1";
+	String Y				= "y";
+	String YES				= "yes";
+	String ONE				= "1";
+	String ZERO				= "0";
+	String DOLLAR_LEFT_BRACE= "${";
+	String UNKNOWN			= "unknown";
+	String GET				= "GET";
+	String POST				= "POST";
+
+}

toolset/utils/src/main/java/com/yonge/toolset/utils/string/StringUtil.java

@@ -0,0 +1,245 @@
+package com.yonge.toolset.utils.string;
+
+import org.springframework.lang.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/17 17:53
+ */
+public class StringUtil {
+    public static boolean isEmpty(@Nullable Object str) {
+        if(null != str){
+            String trim = str.toString().trim();
+            return "".equals(trim);
+        }
+        return true;
+    }
+
+    /**
+     * 首字母变小写
+     *
+     * @param str 字符串
+     * @return {String}
+     */
+    public static String firstCharToLower(String str) {
+        char firstChar = str.charAt(0);
+        if (firstChar >= CharPool.UPPER_A && firstChar <= CharPool.UPPER_Z) {
+            char[] arr = str.toCharArray();
+            arr[0] += (CharPool.LOWER_A - CharPool.UPPER_A);
+            return new String(arr);
+        }
+        return str;
+    }
+
+    /**
+     * 驼峰转下划线(数据库字段)
+     *
+     * @param para 字符串
+     * @return String
+     */
+    public static String humpToUnderline(String para) {
+        para = firstCharToLower(para);
+        StringBuilder sb = new StringBuilder(para);
+        int temp = 0;
+        for (int i = 0; i < para.length(); i++) {
+            if (Character.isUpperCase(para.charAt(i))) {
+                sb.insert(i + temp, "_");
+                temp += 1;
+            }
+        }
+        String s = sb.toString().toLowerCase();
+        return s += "_";
+    }
+
+    /**
+     * 去掉指定后缀
+     *
+     * @param str    字符串
+     * @param suffix 后缀
+     * @return 切掉后的字符串，若后缀不是 suffix， 返回原字符串
+     */
+    public static String removeSuffix(CharSequence str, CharSequence suffix) {
+        if (isEmpty(str) || isEmpty(suffix)) {
+            return StringPool.EMPTY;
+        }
+
+        final String str2 = str.toString();
+        if (str2.endsWith(suffix.toString())) {
+            return subPre(str2, str2.length() - suffix.length());
+        }
+        return str2;
+    }
+
+    /**
+     * 切割指定位置之前部分的字符串
+     *
+     * @param string  字符串
+     * @param toIndex 切割到的位置（不包括）
+     * @return 切割后的剩余的前半部分字符串
+     */
+    public static String subPre(CharSequence string, int toIndex) {
+        return sub(string, 0, toIndex);
+    }
+
+
+    /**
+     * 改进JDK subString<br>
+     * index从0开始计算，最后一个字符为-1<br>
+     * 如果from和to位置一样，返回 "" <br>
+     * 如果from或to为负数，则按照length从后向前数位置，如果绝对值大于字符串长度，则from归到0，to归到length<br>
+     * 如果经过修正的index中from大于to，则互换from和to example: <br>
+     * abcdefgh 2 3 =》 c <br>
+     * abcdefgh 2 -3 =》 cde <br>
+     *
+     * @param str       String
+     * @param fromIndex 开始的index（包括）
+     * @param toIndex   结束的index（不包括）
+     * @return 字串
+     */
+    public static String sub(CharSequence str, int fromIndex, int toIndex) {
+        if (isEmpty(str)) {
+            return StringPool.EMPTY;
+        }
+        int len = str.length();
+
+        if (fromIndex < 0) {
+            fromIndex = len + fromIndex;
+            if (fromIndex < 0) {
+                fromIndex = 0;
+            }
+        } else if (fromIndex > len) {
+            fromIndex = len;
+        }
+
+        if (toIndex < 0) {
+            toIndex = len + toIndex;
+            if (toIndex < 0) {
+                toIndex = len;
+            }
+        } else if (toIndex > len) {
+            toIndex = len;
+        }
+
+        if (toIndex < fromIndex) {
+            int tmp = fromIndex;
+            fromIndex = toIndex;
+            toIndex = tmp;
+        }
+
+        if (fromIndex == toIndex) {
+            return StringPool.EMPTY;
+        }
+
+        return str.toString().substring(fromIndex, toIndex);
+    }
+
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String str) {
+        return toStrArray(",", str);
+    }
+
+    /**
+     * 转换为String数组<br>
+     *
+     * @param split 分隔符
+     * @param str   被转换的值
+     * @return 结果
+     */
+    public static String[] toStrArray(String split, String str) {
+        if (isEmpty(split)) {
+            return new String[]{};
+        }
+        return str.split(split);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param str 被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String str) {
+        return toLongArray(",", str);
+    }
+
+    /**
+     * 转换为Long数组<br>
+     *
+     * @param split 分隔符
+     * @param str   被转换的值
+     * @return 结果
+     */
+    public static Long[] toLongArray(String split, String str) {
+        if (StringUtil.isEmpty(str)) {
+            return new Long[]{};
+        }
+        String[] arr = str.split(split);
+        final Long[] longs = new Long[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            final Long v = toLong(arr[i], 0);
+            longs[i] = v;
+        }
+        return longs;
+    }
+
+
+
+    public static List<Long> toLongList(String str) {
+        return Arrays.asList(toLongArray(str));
+    }
+
+
+
+    /**
+     * 字符串转 long，为空则返回默认值
+     *
+     * <pre>
+     *   $.toLong(null, 1L) = 1L
+     *   $.toLong("", 1L)   = 1L
+     *   $.toLong("1", 0L)  = 1L
+     * </pre>
+     *
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the long represented by the string, or the default if conversion fails
+     */
+    public static long toLong(@Nullable final Object str, final long defaultValue) {
+        return toLong(String.valueOf(str), defaultValue);
+    }
+
+    /**
+     * <p>Convert a <code>String</code> to a <code>long</code>, returning a
+     * default value if the conversion fails.</p>
+     *
+     * <p>If the string is <code>null</code>, the default value is returned.</p>
+     *
+     * <pre>
+     *   NumberUtil.toLong(null, 1L) = 1L
+     *   NumberUtil.toLong("", 1L)   = 1L
+     *   NumberUtil.toLong("1", 0L)  = 1L
+     * </pre>
+     *
+     * @param str          the string to convert, may be null
+     * @param defaultValue the default value
+     * @return the long represented by the string, or the default if conversion fails
+     */
+    public static long toLong(@Nullable final String str, final long defaultValue) {
+        if (str == null) {
+            return defaultValue;
+        }
+        try {
+            return Long.valueOf(str);
+        } catch (final NumberFormatException nfe) {
+            return defaultValue;
+        }
+    }
+}