Merge remote-tracking branch 'origin/master'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/AppConstant.java

@@ -54,4 +54,9 @@ public interface AppConstant {
      * 官网
      */
     String APPLICATION_WEBSITE = "website";
+
+    /**
+     * 网络教室
+     */
+    String APPLICATION_CLASSROOM = "classroom";
 }

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

@@ -1,10 +1,8 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
-import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.beanutils.BeanUtils;

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

@@ -1,38 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.toolset.base.enums.BaseEnum;
-
-/** 
- * 会员状态枚举类
- */
-public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
-
-	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
-	@EnumValue
-	private int code;
-
-	private String remark;
-
-	UserLockFlag(int code, String remark) {
-		this.code = code;
-		this.remark = remark;
-	}
-
-	public Integer getCode() {
-		return this.code;
-	}
-
-	public String getRemark() {
-		return this.remark;
-	}
-
-	public static UserLockFlag codeOf(int code) {
-		for (UserLockFlag userStatus : UserLockFlag.values()) {
-			if (code == userStatus.getCode()) {
-				return userStatus;
-			}
-		}
-		return null;
-	}
-}

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

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
-import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.beanutils.BeanUtils;

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

@@ -4,8 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
-import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
+
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

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

@@ -108,7 +108,16 @@
             p.subject_price_ AS subjectPrice
         FROM teacher_free_time f
                  LEFT JOIN teacher_subject_price p ON f.id_=p.teacher_free_time_id
-        WHERE f.teacher_id_=#{teacherId} AND f.default_flag_=1
+        WHERE f.teacher_id_=#{teacherId}
+        AND f.default_flag_=1
+        AND f.enable_flag_=1
+        AND f.monday_ IS NOT NULL
+        AND f.tuesday_ IS NOT NULL
+        AND f.wednesday_ IS NOT NULL
+        AND f.thursday_ IS NOT NULL
+        AND f.friday_ IS NOT NULL
+        AND f.saturday_ IS NOT NULL
+        AND f.sunday_ IS NOT NULL
     </select>
     <select id="getTeacherFreeTime" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime">
         SELECT * FROM teacher_free_time WHERE default_flag_=1

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

@@ -115,7 +115,8 @@
             u.phone_ as phone,
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
             u.real_name_ as realName,
-            id_card_no_ as idCardNo,
+            u.id_card_no_ as idCardNo,
+            u.lock_flag_ as lockFlag,
             (case when isnull(b.user_id_) then 0 else 1 end) as isBank,
             (
                 SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)

cooleshow-user/user-classroom/src/main/java/com/yonge/cooleshow/classroom/ClassroomApplication.java

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.classroom;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.yonge.cooleshow.common.constant.AppConstant;
+import com.yonge.toolset.base.BaseApplication;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,15 +16,13 @@ import org.springframework.context.annotation.Configuration;
 @EnableFeignClients("com.yonge.cooleshow")
 @MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
 @ComponentScan(basePackages = {
-        "com.yonge.cooleshow.classroom", "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", "com.yonge.toolset.payment"
+        "com.yonge.cooleshow", "com.yonge.toolset"
 })
 @Configuration
 @EnableSwagger2Doc
 public class ClassroomApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ClassroomApplication.class, args);
+        BaseApplication.run(AppConstant.APPLICATION_CLASSROOM, ClassroomApplication.class, args);
     }
 
 }