修改bug

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

@@ -55,5 +55,8 @@ public interface TeacherFreeTimeDao extends BaseMapper<TeacherFreeTime> {
 
     //查询老师声部默认售价
     TeacherSubjectPrice selectSubjectPrice(@Param("teacherId") Long teacherId, @Param("subjectId") Long subjectId);
+
+    //查询老师所有声部配置
+    List<TeacherSubjectPrice> selectPriceByTeacherId(Long teacherId);
 }
 

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

@@ -13,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 视频课基本信息表
@@ -50,7 +52,7 @@ public class VideoLessonGroup extends BaseEntity {
     @TableField("lesson_price_")
     @ApiModelProperty(value = "课程价格", required = true)
     @NotNull(message = "课程价格不能为空;", groups = {AddGroup.class, UpdateGroup.class})
-    private Integer lessonPrice;  //课程价格
+    private BigDecimal lessonPrice;  //课程价格
 
     @TableField("lesson_cover_url_")
     @ApiModelProperty(value = "课程封面图片URL", required = true)
@@ -101,25 +103,28 @@ public class VideoLessonGroup extends BaseEntity {
     @ApiModelProperty(value = "审批人id")
     private Integer auditId;
 
-    public String getAuditName() {
-        return auditName;
+    public Long getId() {
+        return id;
     }
 
-    public void setAuditName(String auditName) {
-        this.auditName = auditName;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public Integer getAuditId() {
-        return auditId;
+    public String getLessonName() {
+        return lessonName;
     }
 
-    public void setAuditId(Integer auditId) {
-        this.auditId = auditId;
+    public void setLessonName(String lessonName) {
+        this.lessonName = lessonName;
     }
 
-    public VideoLessonGroup setId(Long id) {
-        this.id = id;
-        return this;
+    public String getLessonSubject() {
+        return lessonSubject;
+    }
+
+    public void setLessonSubject(String lessonSubject) {
+        this.lessonSubject = lessonSubject;
     }
 
     public String getLessonSubjectName() {
@@ -130,107 +135,76 @@ public class VideoLessonGroup extends BaseEntity {
         this.lessonSubjectName = lessonSubjectName;
     }
 
-    public Long getId() {
-        return this.id;
-    }
-
-    public VideoLessonGroup setLessonName(String lessonName) {
-        this.lessonName = lessonName;
-        return this;
-    }
-
-    public String getLessonName() {
-        return this.lessonName;
-    }
-
-    public VideoLessonGroup setLessonSubject(String lessonSubject) {
-        this.lessonSubject = lessonSubject;
-        return this;
-    }
-
-    public String getLessonSubject() {
-        return this.lessonSubject;
+    public String getLessonDesc() {
+        return lessonDesc;
     }
 
-    public VideoLessonGroup setLessonDesc(String lessonDesc) {
+    public void setLessonDesc(String lessonDesc) {
         this.lessonDesc = lessonDesc;
-        return this;
     }
 
-    public String getLessonDesc() {
-        return this.lessonDesc;
+    public BigDecimal getLessonPrice() {
+        return lessonPrice;
     }
 
-    public VideoLessonGroup setLessonPrice(Integer lessonPrice) {
+    public void setLessonPrice(BigDecimal lessonPrice) {
         this.lessonPrice = lessonPrice;
-        return this;
     }
 
-    public Integer getLessonPrice() {
-        return this.lessonPrice;
+    public String getLessonCoverUrl() {
+        return lessonCoverUrl;
     }
 
-    public VideoLessonGroup setLessonCoverUrl(String lessonCoverUrl) {
+    public void setLessonCoverUrl(String lessonCoverUrl) {
         this.lessonCoverUrl = lessonCoverUrl;
-        return this;
     }
 
-    public String getLessonCoverUrl() {
-        return this.lessonCoverUrl;
+    public Long getTeacherId() {
+        return teacherId;
     }
 
-    public VideoLessonGroup setTeacherId(Long teacherId) {
+    public void setTeacherId(Long teacherId) {
         this.teacherId = teacherId;
-        return this;
     }
 
-    public Long getTeacherId() {
-        return this.teacherId;
+    public Integer getLessonCount() {
+        return lessonCount;
     }
 
-    public VideoLessonGroup setLessonCount(Integer lessonCount) {
+    public void setLessonCount(Integer lessonCount) {
         this.lessonCount = lessonCount;
-        return this;
     }
 
-    public Integer getLessonCount() {
-        return this.lessonCount;
+    public Integer getSortNumber() {
+        return sortNumber;
     }
 
-    public VideoLessonGroup setSortNumber(Integer sortNumber) {
+    public void setSortNumber(Integer sortNumber) {
         this.sortNumber = sortNumber;
-        return this;
     }
 
-    public Integer getSortNumber() {
-        return this.sortNumber;
+    public String getLessonTag() {
+        return lessonTag;
     }
 
-    public VideoLessonGroup setLessonTag(String lessonTag) {
+    public void setLessonTag(String lessonTag) {
         this.lessonTag = lessonTag;
-        return this;
     }
 
-    public String getLessonTag() {
-        return this.lessonTag;
+    public Integer getTopFlag() {
+        return topFlag;
     }
 
-    public VideoLessonGroup setTopFlag(Integer topFlag) {
+    public void setTopFlag(Integer topFlag) {
         this.topFlag = topFlag;
-        return this;
     }
 
-    public Integer getTopFlag() {
-        return this.topFlag;
+    public Integer getHotFlag() {
+        return hotFlag;
     }
 
-    public VideoLessonGroup setHotFlag(Integer hotFlag) {
+    public void setHotFlag(Integer hotFlag) {
         this.hotFlag = hotFlag;
-        return this;
-    }
-
-    public Integer getHotFlag() {
-        return this.hotFlag;
     }
 
     public AuthStatusEnum getAuditStatus() {
@@ -241,27 +215,35 @@ public class VideoLessonGroup extends BaseEntity {
         this.auditStatus = auditStatus;
     }
 
-    public VideoLessonGroup setCreateTime(java.util.Date createTime) {
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
-        return this;
     }
 
-    public java.util.Date getCreateTime() {
-        return this.createTime;
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
-    public VideoLessonGroup setUpdateTime(java.util.Date updateTime) {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
-        return this;
     }
 
-    public java.util.Date getUpdateTime() {
-        return this.updateTime;
+    public String getAuditName() {
+        return auditName;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
     }
 
+    public Integer getAuditId() {
+        return auditId;
+    }
+
+    public void setAuditId(Integer auditId) {
+        this.auditId = auditId;
+    }
 }

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

@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_group_detail-视频课明细表")
-public class VideoLessonGroupDetail extends BaseEntity {
+public class 	VideoLessonGroupDetail extends BaseEntity {
 
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "主键id")

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

@@ -187,6 +187,6 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     StudentHomePage queryLiveAndVideo(Long studentId);
 
-    TeacherSubjectPrice teacherSubjectPrice(Long teacherId, Long subjectId);
+    List<TeacherSubjectPrice> teacherSubjectPrice(Long teacherId);
 }
 

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

@@ -983,7 +983,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Author: cy
      * @Date: 2022/4/26
      */
-    public TeacherSubjectPrice teacherSubjectPrice(Long teacherId,Long subjectId){
-        return teacherFreeTimeDao.selectSubjectPrice(teacherId,subjectId);
+    public List<TeacherSubjectPrice> teacherSubjectPrice(Long teacherId){
+        return teacherFreeTimeDao.selectPriceByTeacherId(teacherId);
     }
 }

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

@@ -95,16 +95,16 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
         purchaseRecord.setOrderNo(orderNo);
         purchaseRecord.setStudentId(studentId);
         purchaseRecord.setOrderStatus(0);
-        purchaseRecord.setOriginalPrice(BigDecimal.valueOf(lessonGroup.getLessonPrice()));//原价
-        purchaseRecord.setExpectPrice(BigDecimal.valueOf(lessonGroup.getLessonPrice()));//预计价格
+        purchaseRecord.setOriginalPrice(lessonGroup.getLessonPrice());//原价
+        purchaseRecord.setExpectPrice(lessonGroup.getLessonPrice());//预计价格
         videoLessonPurchaseRecordDao.insert(purchaseRecord);
 
         OrderCreateRes orderCreateRes = new OrderCreateRes();
         orderCreateRes.setRes(true);
         orderCreateRes.setMerchId(lessonGroup.getTeacherId());
         orderCreateRes.setBizId(orderReqInfo.getCouponId());
-        orderCreateRes.setOriginalPrice(BigDecimal.valueOf(lessonGroup.getLessonPrice()));//原价
-        orderCreateRes.setExpectPrice(BigDecimal.valueOf(lessonGroup.getLessonPrice()));//预计价格
+        orderCreateRes.setOriginalPrice(lessonGroup.getLessonPrice());//原价
+        orderCreateRes.setExpectPrice(lessonGroup.getLessonPrice());//预计价格
         orderCreateRes.setActualPrice(purchaseRecord.getPayMoney());//实际价格
         orderCreateRes.setGoodNum(lessonGroup.getLessonCount());
         orderCreateRes.setGoodType(GoodTypeEnum.VIDEO);

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

@@ -95,4 +95,19 @@
         LEFT JOIN teacher_subject_price p ON f.id_=p.teacher_free_time_id
         WHERE f.teacher_id_=#{teacherId} AND f.default_flag_=1 AND p.subject_id_=#{subjectId}
     </select>
+    <select id="selectPriceByTeacherId" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherSubjectPrice"
+            parameterType="java.lang.Long">
+        SELECT
+            p.id_ AS id,
+            p.teacher_free_time_id AS teacherFreeTimeId,
+            p.teacher_id_ AS teacherId,
+            p.free_minutes_ AS freeMinutes,
+            p.course_minutes_ AS courseMinutes,
+            p.subject_id_ AS subjectId,
+            p.subject_name_ AS subjectName,
+            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
+    </select>
 </mapper>

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

@@ -152,8 +152,8 @@ public class StudentCourseScheduleController extends BaseController {
 
     @ApiOperation("查询老师陪练课配置")
     @GetMapping("/getTeacherSubjectPrice")
-    public HttpResponseResult<TeacherSubjectPrice> getTeacherSubjectPrice(@NotNull Long teacherId, @NotNull Long subjectId) {
-        return succeed(courseScheduleService.teacherSubjectPrice(teacherId, subjectId));
+    public HttpResponseResult<List<TeacherSubjectPrice>> getTeacherSubjectPrice(@NotNull Long teacherId) {
+        return succeed(courseScheduleService.teacherSubjectPrice(teacherId));
     }
 }
 

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -2,7 +2,13 @@ package com.yonge.toolset.thirdparty.storage.provider;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+import com.alibaba.fastjson.JSON;
+import com.ksyun.ks3.dto.PostObjectFormFields;
 import org.apache.commons.io.FileUtils;
 import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.DisposableBean;