Merge branch 'feature/1108_audio' into develop-new

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java
#	cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

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

@@ -52,6 +52,9 @@ public class Subject implements Serializable {
     @ApiModelProperty(value = "cbs声部名称")
     private String cbsSubjectName;
 
+	@ApiModelProperty(value = "总控乐器ID")
+	private Long instrumentId;
+
 	@TableField(value = "enable_flag_")
 	private Boolean enableFlag;
 

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

@@ -1655,7 +1655,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
 
         if ((teacherFreeTime.getMonday() == null || teacherFreeTime.getMonday().equals("[]")) &&
-                (teacherFreeTime.getThursday() == null || teacherFreeTime.getThursday().equals("[]")) &&
+                (teacherFreeTime.getTuesday() == null || teacherFreeTime.getTuesday().equals("[]")) &&
                 (teacherFreeTime.getWednesday() == null || teacherFreeTime.getWednesday().equals("[]")) &&
                 (teacherFreeTime.getThursday() == null || teacherFreeTime.getThursday().equals("[]")) &&
                 (teacherFreeTime.getFriday() == null || teacherFreeTime.getFriday().equals("[]")) &&

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

@@ -108,7 +108,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
         // 更新学生时长
         studentService.lambdaUpdate()
                 .set(Student::getDiscountEndTime, discountCardRecord.getEndTime())
-                .set(student.getDiscountStartTime() == null,Student::getDiscountStartTime, discountCardRecord.getEndTime())
+                .set(student.getDiscountStartTime() == null,Student::getDiscountStartTime, discountCardRecord.getStartTime())
                 .eq(Student::getUserId, orderDetailVo.getUserId())
                 .update();
 

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

@@ -143,6 +143,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                     detail.setUserStatus(UserStatusEnum.NORMAL);
                 }
             }
+
+            // 设置学生声部乐器ID
+            if (StringUtils.isNotBlank(detail.getSubjectId())) {
+                List<Subject> subjects = subjectDao.findBySubjectByIdList(detail.getSubjectId());
+                // 设置声部乐器
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(subjects)) {
+                    detail.setInstrumentId(subjects.stream()
+                        .map(Subject::getInstrumentId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
+                }
+            }
         }
         return detail;
     }

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

@@ -69,6 +69,7 @@ public class TenantAlbumPurchaseServiceImpl extends ServiceImpl<TenantAlbumPurch
             UserOrder userOrder = mapByOrderNos.get(tenantAlbumPurchase.getOrderNo());
             if (userOrder != null) {
                 tenantAlbumPurchase.setPurchaseStatus(getPurchaseStatus(userOrder.getStatus()));
+                tenantAlbumPurchase.setPaymentVendor(userOrder.getPaymentVendor());
             } else {
                 tenantAlbumPurchase.setPurchaseStatus(OrderStatusEnum.CLOSE.getCode());
             }

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

@@ -106,6 +106,9 @@ public class StudentVo extends Student {
     @ApiModelProperty("客服数量")
     private Integer customerServiceNum;
 
+    @ApiModelProperty(value = "总控乐器ID")
+    private String instrumentId;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumPurchaseWrapper.java

@@ -110,6 +110,9 @@ public class TenantAlbumPurchaseWrapper {
         private String purchaseType;
 
 
+        @ApiModelProperty("支付厂商")
+        private String paymentVendor;
+
         @ApiModelProperty("更新时间")
         private Date updateTime;
 

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

@@ -1350,13 +1350,44 @@
         where id_ = #{musicSheetId}
     </update>
 
+    <select id="musicSheetTotal"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherHomeWrapper$MusicSheetTotal">
+        select
+        if(t.audit_status_ = 'PASS' and t.state_ = 1,1,0) as musicSheetNum,
+        if(t.audit_status_ = 'DOING' ,1,0) musicSheetAuditNum,
+        t.exposure_num_ musicSheetExposureNum
+        from music_sheet t
+        where t.del_flag_=0 and t.user_id_ = #{teacherId}
+    </select>
+
+    <select id="musicSheetPage"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherHomeWrapper$MusicSheetTotal">
+        select
+        t.music_sheet_name_ musicSheetName,
+        t.create_time_ createTime,
+        t.exposure_num_ musicSheetExposureNum,
+        count(distinct t1.buy_user_) musicSheetPayNum,
+        sum(t1.trans_amount_) as musicSheetIncome
+        from music_sheet t
+         left join user_cash_account_record t1 on t.id_ = t1.biz_id_
+        where t1.account_id_ =  #{param.teacherId}
+        and t1.biz_type_ = 'MUSIC_SHARE'
+        and t1.post_status_ = 'RECORDED'
+        and t1.in_or_out_ = 'IN'
+        and  t.del_flag_=0 and t.user_id_ = #{param.teacherId}
+        group by t.id_
+        order by t.create_time_ desc
+        limit #{param.rows}
+
+    </select>
+
     <select id="cloudPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.MusicSheetWrapper$MusicSheetCloud">
         select t.id_, t.music_sheet_name_,t.title_img_,t.composer_,t.cbs_music_sheet_id_ ,t.payment_type_,t.music_price_ as musicPrice
         from (
         select a.* from
         music_sheet a
         <if test="param.providerType != null and param.providerType.code == 'TENANT'">
-            left join tenant_album_music tam on a.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0 and tam.tenant_album_id_ in 
+            left join tenant_album_music tam on a.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0 and tam.tenant_album_id_ in
             <foreach collection="param.tenantAlbumIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
@@ -1462,7 +1493,7 @@
             left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.userId} and mf.client_type_ = #{param.clientType} and mf.provider_type_ = #{param.providerType}
         </if>
         <where>
-            
+
             <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
                 and mf.id_ is not null
             </if>
@@ -1482,7 +1513,7 @@
                 </if>
 
             </if>
-            
+
         </where>
 
         GROUP BY t.id_
@@ -1496,37 +1527,6 @@
 
         t.sort_group_, t.sort_num_, t.sort_num2_, t.alias_
     </select>
-
-    <select id="musicSheetTotal"
-            resultType="com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherHomeWrapper$MusicSheetTotal">
-        select
-        if(t.audit_status_ = 'PASS' and t.state_ = 1,1,0) as musicSheetNum,
-        if(t.audit_status_ = 'DOING' ,1,0) musicSheetAuditNum,
-        t.exposure_num_ musicSheetExposureNum
-        from music_sheet t
-        where t.del_flag_=0 and t.user_id_ = #{teacherId}
-    </select>
-
-    <select id="musicSheetPage"
-            resultType="com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherHomeWrapper$MusicSheetTotal">
-        select
-        t.music_sheet_name_ musicSheetName,
-        t.create_time_ createTime,
-        t.exposure_num_ musicSheetExposureNum,
-        count(distinct t1.buy_user_) musicSheetPayNum,
-        sum(t1.trans_amount_) as musicSheetIncome
-        from music_sheet t
-         left join user_cash_account_record t1 on t.id_ = t1.biz_id_
-        where t1.account_id_ =  #{param.teacherId}
-        and t1.biz_type_ = 'MUSIC_SHARE'
-        and t1.post_status_ = 'RECORDED'
-        and t1.in_or_out_ = 'IN'
-        and  t.del_flag_=0 and t.user_id_ = #{param.teacherId}
-        group by t.id_
-        order by t.create_time_ desc
-        limit #{param.rows}
-
-    </select>
     <select id="selectMusicAlbumNum" resultType="java.lang.Long">
         SELECT COUNT(DISTINCT t1.id_) AS total
         FROM album_music_relate t1 JOIN music_sheet t2 ON (t1.music_sheet_id_ = t2.id_)

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

@@ -16,6 +16,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
+        <result column="instrument_id_" property="instrumentId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -26,7 +26,7 @@
         , t.video_url_ as videoUrl
         , t.cover_ as cover
         , t.describe_ as `describe`
-        , t.browse_ as browse
+        , t.browse_  as browse
         , t.audit_version_ as auditVersion
         , t.auth_status_ as authStatus
 		, t.virtual_number_ as virtualNumber
@@ -88,7 +88,21 @@
 	<!-- 根据老师id查询 -->
     <select id="selectListByUserId" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo">
 		SELECT
-			<include refid="baseColumns"/>
+			t.id_ as id
+			 , t.user_id_ as userId
+			 , t.video_url_ as videoUrl
+			 , t.cover_ as cover
+			 , t.describe_ as `describe`
+			 , t.browse_ + t.virtual_number_  as browse
+			 , t.audit_version_ as auditVersion
+			 , t.auth_status_ as authStatus
+			 , t.virtual_number_ as virtualNumber
+			 , t.verify_user_id_ as verifyUserId
+			 , t.reason_ as reason
+			 , t.entry_flag_ as entryFlag
+			 , t.create_time_ as createTime
+			 , t.update_time_ as updateTime
+			 , t.del_flag_ as delFlag
 		FROM teacher_style_video t
 		WHERE t.del_flag_ = 0 and t.user_id_ = #{userId}
 	</select>