Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherSubjectPriceController.java

@@ -69,5 +69,16 @@ public class TeacherSubjectPriceController extends BaseController {
         }
         return succeed();
     }
+
+    @ApiOperation(value = "获取老师课程价格配置")
+    @PostMapping("/list")
+    public HttpResponseResult<List<TeacherSubjectPrice>> list(@RequestBody TeacherSubjectPriceWrapper.PriceSearch query){
+        List<TeacherSubjectPrice> list = teacherSubjectPriceService.lambdaQuery()
+                .eq(TeacherSubjectPrice::getTeacherId, sysUserService.getUserId())
+                .eq(query.getSubjectId() != null, TeacherSubjectPrice::getSubjectId, query.getSubjectId())
+                .eq(StringUtils.isNotEmpty(query.getCourseType()), TeacherSubjectPrice::getCourseType, query.getCourseType())
+                .list();
+        return succeed(list);
+    }
 }
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/payment/EPaymentType.java

@@ -19,6 +19,8 @@ public enum EPaymentType {
     ACTI_REGIST("活动报名"),
     ALBUM("专辑购买"),
     TENANT_ALBUM("平台专辑"),
+    VIP_COURSE("VIP定制课"),
+    DISCOUNT("畅学卡")
     ;
 
     private final String msg;

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

@@ -0,0 +1,52 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.activity.ActivityRankingMethodEnum;
+import com.yonge.cooleshow.biz.dal.enums.activity.ActivityRankingRuleEnum;
+import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
+import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 活动计划表
+ */
+@TableName("user_remind")
+@ApiModel(value = "UserRemind", description = "用户提醒表")
+@Data
+public class UserRemind implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "提醒类型")
+    private String remindType;
+
+    @ApiModelProperty(value = "客户端")
+    private String client;
+
+    @ApiModelProperty("创建时间 ")
+    @TableField(value = "create_time_")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间 ")
+    @TableField(value = "update_time_")
+    private Date updateTime;
+}

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

@@ -23,6 +23,8 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     WITHDRAWAL("结算"),
     ALBUM("专辑购买"),
     TENANT_ALBUM("训练教程"),
+    VIP_COURSE("VIP定制课"),
+    DISCOUNT("畅学卡"),
 
     LIVE_SHARE("直播课分润"),
     VIDEO_SHARE("视频课分润"),