Merge branch 'ljc_dev1.2' into dev_1_2_20220802

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

@@ -100,7 +100,7 @@ public class AdminCourseGroupController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        if (dto.getCourseGourpId() == null) {
+        if (dto.getCourseGroupId() == null) {
             return failed("课程组id不能为空");
         }
 

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

@@ -188,7 +188,8 @@ public class MusicSheetController extends BaseController {
         if (musicSheet == null) {
             return failed("未找到曲目");
         }
-        if (musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
+        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
+                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
             return failed("请填写下架原因");
         }
         return status(musicSheetService.state(id,reason));

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

@@ -14,9 +14,9 @@ import javax.validation.constraints.NotNull;
 @ApiModel("直播课下架参数")
 public class LiveSaleOutDto {
 
-    @NotNull(message = "课程组名不能为空")
+    @NotNull(message = "课程组id不能为空")
     @ApiModelProperty(value = "直播课课程组id",required = true)
-    private Long courseGourpId;
+    private Long courseGroupId;
 
     @NotNull(message = "上下架状态不能为空")
     @ApiModelProperty(value = "上下架  0：下架 1：上架",required = true)
@@ -27,12 +27,12 @@ public class LiveSaleOutDto {
     private String reason;
 
 
-    public Long getCourseGourpId() {
-        return courseGourpId;
+    public Long getCourseGroupId() {
+        return courseGroupId;
     }
 
-    public void setCourseGourpId(Long courseGourpId) {
-        this.courseGourpId = courseGourpId;
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
     }
 
     public Long getStatus() {

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

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alipay.api.domain.AccountRecord;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +14,6 @@ import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto.CoursePlanDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveSaleOutDto;
 import com.yonge.cooleshow.biz.dal.dto.UserAccountRecordDto;
-import com.yonge.cooleshow.biz.dal.dto.req.OrderRefundReq;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.*;
@@ -24,7 +22,6 @@ import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.cooleshow.biz.dal.vo.res.RefundCreateRes;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
@@ -42,13 +39,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -1277,7 +1274,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     public Boolean liveSaleOut(LiveSaleOutDto dto) {
 
 
-        CourseGroup liveCourseGroupVo = this.getById(dto.getCourseGourpId());
+        CourseGroup liveCourseGroupVo = this.getById(dto.getCourseGroupId());
         if (liveCourseGroupVo == null || !CourseScheduleEnum.LIVE.getCode().equals(liveCourseGroupVo.getType())) {
             throw new BizException("没找到课程组信息");
         }
@@ -1289,7 +1286,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
             throw new BizException("只能下架销售中的课程组");
         } else if (dto.getStatus() == 1  && !CourseGroupEnum.OUT_SALE.getCode().equals(liveCourseGroupVo.getStatus())) {
             throw new BizException("只能上架被下架的课程组");
-        } else if ( new Date().compareTo(liveCourseGroupVo.getSalesEndDate()) > 0) {
+        } else if ( LocalDate.now().compareTo(liveCourseGroupVo.getSalesEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) > 0) {
             throw new BizException("课程组售卖时间已结束，不能操作");
         }
 

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

@@ -149,15 +149,25 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             musicSheet.setTopFlag(YesOrNoEnum.NO);
 
             // 下架发送推送
-            if(musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER)) {
-
-            }
+            sendOutSaleMessage(reason, musicSheet);
 
         }
         return this.updateById(musicSheet);
 
     }
 
+    private void sendOutSaleMessage(String reason, MusicSheet musicSheet) {
+        if(musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER)) {
+            SysUser sysUser = getSysUser(musicSheet.getUserId());
+            // 推送老师
+            Map<Long, String> teacherReceivers = new HashMap<>();
+            teacherReceivers.put(sysUser.getId(), sysUser.getPhone());
+
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.MUSIC_SHEET_OUT_SALE_REASON, teacherReceivers, null,
+                               0, null, ClientEnum.TEACHER.getCode(), musicSheet.getMusicSheetName(),reason);
+        }
+    }
+
     @Override
     public IPage<MusicSheetVo> selectAlbumDetailPage(IPage<MusicSheetVo> page, MusicAlbumDetailSearch query) {
         return page.setRecords(baseMapper.selectAlbumDetailPage(page, query));

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

@@ -82,15 +82,16 @@
                 and t.audit_version_ = #{query.auditVersion}
             </if>
         </where>
+        order by t.sort_number_ desc,
         <if test="query.sortBy != null">
             <choose>
                 <when test="query.sortBy == 1">
-                    order by t2.num desc
+                    t2.num desc
                 </when>
             </choose>
         </if>
         <if test="query.sortBy == null">
-            order by t.id_ desc
+            t.id_ desc
         </if>
     </select>
 
@@ -232,15 +233,16 @@
                 and t.audit_version_ = #{query.auditVersion}
             </if>
         </where>
+        order by t.sort_number_ desc,
         <if test="query.sortBy != null">
             <choose>
                 <when test="query.sortBy == 1">
-                    order by t2.num desc
+                     t2.num desc
                 </when>
             </choose>
         </if>
         <if test="query.sortBy == null">
-            order by t.id_ desc
+             t.id_ desc
         </if>
     </select>
 </mapper>

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

@@ -165,7 +165,7 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(YesOrNoEnum.YES);
+        // search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
         search.setUserType(ClientEnum.STUDENT);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);

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

@@ -159,7 +159,7 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
         search.setStudentId(sysUser.getId());
-        search.setState(YesOrNoEnum.YES);
+        // search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(search),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));