Merge remote-tracking branch 'origin/dev_1_2_20220802' into dev_1_2_20220802

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

@@ -177,12 +177,18 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         MusicActivityVo activityVo = new MusicActivityVo();
         BeanUtils.copyProperties(activityPlan, activityVo);
 
+        Long userId = null;
+        if (user != null && user.getId() != null) {
+            userId = user.getId();
+        }
+
+
         // 活动曲目
-        List<ActivityMusicVo> activityMusicVoList = activityEvaluationService.getActivityMusic(activityPlanId, user.getId());
+        List<ActivityMusicVo> activityMusicVoList = activityEvaluationService.getActivityMusic(activityPlanId, userId);
         activityVo.setActivityMusicVoList(activityMusicVoList);
 
         // 报名状态
-        activityVo.setJoin(activityRegistrationService.getRegistration(user.getId(), activityPlanId));
+        activityVo.setJoin(activityRegistrationService.getRegistration(userId, activityPlanId));
 
         // 活动奖品
         List<ActivityReward> activityRewardList = activityRewardService.getActivityReward(activityPlanId);

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

@@ -35,6 +35,9 @@ public class ActivityMusicVo {
     private double score;
 
 
+    @ApiModelProperty("最高分的用户id")
+    private Long userId;
+
     @ApiModelProperty("最高分用户头像")
     private String userAvatar;
 
@@ -44,6 +47,14 @@ public class ActivityMusicVo {
     @ApiModelProperty("最高分用户声部")
     private String userSubject;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Long getEvaluationId() {
         return evaluationId;
     }

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

@@ -52,7 +52,7 @@
 
     <select id="selectActivityMusic" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo">
 
-        select ms.id_ as musciSheetId
+        select ms.id_ as musicSheetId
         ,ms.music_sheet_name_ as musicSheetName
         ,s.name_ as musicSubject
         ,ae.id_ as evaluationId
@@ -63,8 +63,9 @@
         left join music_sheet ms on ms.id_ = ae.music_sheet_id_
         left join subject s on s.id_ = ms.music_subject_
         <where>
+            ms.del_flag_ = 0 and ms.state_ = 1
             <if test="activityPlanId != null">
-                ae.activity_id_ = #{activityPlanId}
+                and ae.activity_id_ = #{activityPlanId}
             </if>
         </where>
     </select>
@@ -75,6 +76,7 @@
         ,t.avatar_ as userAvatar
         ,s.name_ as userSubject
         ,t.evaluationId
+        ,t.userId
         from
         (select
             max(aem.score_) as score,
@@ -82,6 +84,7 @@
             aem.user_id_,
         su.username_,
         su.avatar_,
+        su.id_ as userId,
         aem.evaluation_id_ as evaluationId
 
         from  activity_evaluation_record aem

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

@@ -539,7 +539,7 @@
         SELECT
         distinct
             cs.id_ AS courseId,
-            g.course_introduce_ AS courseIntroduce,
+        cp.plan_ AS courseIntroduce,
             cs.class_num_ AS classNum,
             cs.class_date_ AS classDate,
             cs.start_time_ AS startTime,
@@ -553,6 +553,7 @@
         LEFT JOIN course_group g ON cs.course_group_id_=g.id_
         LEFT JOIN course_schedule_teacher_salary ts ON cs.id_=ts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_
+        left join course_plan cp on cp.course_group_id_ = cs.course_group_id_ and cp.class_num_ = cs.class_num_
         WHERE cs.course_group_id_= #{param.groupId}
         <if test="param.salaryStatus != null and param.salaryStatus != ''">
             AND ts.status_ = #{param.salaryStatus}

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

@@ -105,20 +105,20 @@
     </select>
 
     <select id="queryStudentInfoByGroupId" parameterType="map" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo$CourseBuyStudentVo">
-        select distinct a.user_id_      as studentId,
+        select distinct o.user_id_      as studentId,
                b.real_name_    as studentName,
                b.username_    as userName,
                b.avatar_ as avatar,
-               a.created_time_ as createTime
-        from course_schedule_student_payment as a
-                 left join sys_user as b on a.user_id_ = b.id_
-                 left join user_order as o on a.order_no_ = o.order_no_
-        where a.course_group_id_ = #{param.groupId}
+               a.create_time_ as createTime
+        from user_order_detail as a
+        left join user_order as o on a.order_no_ = o.order_no_
+                 left join sys_user as b on o.user_id_ = b.id_
+        where a.biz_id_ = #{param.groupId} and a.good_type_ = 'LIVE'
         <if test="param.orderState != null and param.orderState != ''">
             AND o.status_ = #{param.orderState}
         </if>
         <if test="param.userId != null and param.userId != ''">
-            AND a.user_id_ = #{param.userId}
+            AND o.user_id_ = #{param.userId}
         </if>
     </select>
     <select id="selectAll" resultType="java.lang.Long">

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

@@ -31,20 +31,6 @@ public class StudentActivityController extends BaseController {
     private ActivityPlanService activityPlanService;
 
 
-    @ApiOperation(value = "活动信息", notes = "活动id")
-    @PostMapping(value = "/info/{id}")
-    public HttpResponseResult<MusicActivityVo> getDetail(@PathVariable Long id) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
-        MusicActivityVo activityVo = activityPlanService.getActivityInfo(id, user);
-
-        return succeed(activityVo);
-    }
-
-
     @ApiOperation(value = "评测活动参与项目", notes = "评测项目id")
     @PostMapping(value = "/evaluation/{evaluationId}")
     public HttpResponseResult<Boolean> joinEvaluation(@PathVariable Long evaluationId) {

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

@@ -1,7 +1,11 @@
 package com.yonge.cooleshow.student.controller.open;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -9,10 +13,7 @@ import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -23,6 +24,8 @@ import java.util.Map;
 public class OpenClient extends BaseController {
     @Autowired
     private TeacherService teacherService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @Autowired
     private StudentService studentService;
@@ -55,4 +58,20 @@ public class OpenClient extends BaseController {
         }
         return studentService.bindTeacher(phone, userId, isUpdate);
     }
+
+
+
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
+
+    @ApiOperation(value = "活动信息", notes = "活动id")
+    @PostMapping(value = "/activity/info/{id}")
+    public HttpResponseResult<MusicActivityVo> getDetail(@PathVariable Long id) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+
+        MusicActivityVo activityVo = activityPlanService.getActivityInfo(id, user);
+
+        return succeed(activityVo);
+    }
 }