cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -300,7 +300,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         //更新imUserFriend表用户头像
         sysUserDao.updateImUserFriend(userId, setDetail.getUsername(), setDetail.getAvatar());
         try {
-            adminFeignService.register(userId.toString(),clientType, setDetail.getUsername(), setDetail.getAvatar());
+            adminFeignService.register(userId.toString(),"STUDENT", setDetail.getUsername(), setDetail.getAvatar());
+        } catch (Exception e) {
+            throw new BizException("更新用户信息失败");
+        }
+        try {
+            adminFeignService.register(userId.toString(),"TEACHER", setDetail.getUsername(), setDetail.getAvatar());
         } catch (Exception e) {
             throw new BizException("更新用户信息失败");
         }

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

@@ -100,7 +100,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 				// 单曲统计
 				MusicCompareWrapper.RecordInfo musicStatRecord = MusicCompareWrapper.RecordInfo.builder()
-						.musicSheetId(record.getMusicSheetId())
+						.musicSheetId(record.getMusicSheetId().toString())
 						.clientId(clientType)
 						.userId(0L)
 						.recentTime(DateTime.now().getMillis())
@@ -108,7 +108,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 				// 用户单曲统计
 				MusicCompareWrapper.RecordInfo userStatRecord = MusicCompareWrapper.RecordInfo.builder()
-						.musicSheetId(record.getMusicSheetId())
+						.musicSheetId(record.getMusicSheetId().toString())
 						.clientId(clientType)
 						.userId(record.getUserId())
 						.recentTime(DateTime.now().getMillis())

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

@@ -29,7 +29,7 @@ public class HomeMusicSheetVo {
     public static class MusicSheetSmall{
 
         @ApiModelProperty("曲目编号")
-        private Long  musicSheetId;
+        private String  musicSheetId;
 
         @ApiModelProperty("曲目名称")
         private String musicSheetName;
@@ -38,11 +38,11 @@ public class HomeMusicSheetVo {
         private Integer num;
 
 
-        public Long getMusicSheetId() {
+        public String getMusicSheetId() {
             return musicSheetId;
         }
 
-        public void setMusicSheetId(Long musicSheetId) {
+        public void setMusicSheetId(String musicSheetId) {
             this.musicSheetId = musicSheetId;
         }
 

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

@@ -175,7 +175,7 @@ public class MusicCompareWrapper {
         private Long id;
 
         @ApiModelProperty("曲目ID")
-        private Long musicSheetId;
+        private String musicSheetId;
 
         @ApiModelProperty("客户端标识")
         private ClientEnum clientId;

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

@@ -25,7 +25,7 @@
     <resultMap id="MusicCompareRecordPageResultMap"
                type="com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper$RecordInfo">
         <id column="id_" property="id" />
-        <result column="music_sheet_id_" property="musicSheetId" />
+        <result column="cbs_music_sheet_id_" property="musicSheetId" />
         <result column="train_duration_" property="trainDuration" />
         <result column="train_frequency_" property="trainFrequency" />
         <result column="evaluate_duration_" property="evaluateDuration" />
@@ -36,9 +36,10 @@
         <result column="music_tag_" property="musicTag" />
     </resultMap>
     <select id="selectMusicCompareRecordPage" resultMap="MusicCompareRecordPageResultMap">
-        SELECT t1.id_, t1.music_sheet_id_, t1.user_id_, t1.train_duration_, t1.train_frequency_, t1.evaluate_duration_, t1.evaluate_frequency_, t1.recent_time_, t2.music_sheet_name_, t2.composer_, t2.music_tag_
+        SELECT t1.id_, t2.cbs_music_sheet_id_, t1.user_id_, t1.train_duration_, t1.train_frequency_, t1.evaluate_duration_, t1.evaluate_frequency_, t1.recent_time_, t2.music_sheet_name_, t2.composer_, t2.music_tag_
         FROM music_compare_record_stat t1 LEFT JOIN music_sheet t2 ON t1.music_sheet_id_ = t2.id_
         <where>
+            t2.cbs_music_sheet_id_ is not null
             <if test="record.clientType != null">
                 AND t1.client_id_ = #{record.clientType}
             </if>

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

@@ -837,14 +837,14 @@
     <select id="selectPayMusicSheet" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo$MusicSheetSmall">
 
         SELECT
-            ms.id_ as musicSheetId,
+            ms.cbs_music_sheet_id_ as musicSheetId,
             ms.music_sheet_name_ as musicSheetName,
             count(DISTINCT pr.student_id_) as num
         FROM
             music_sheet ms
                 LEFT JOIN music_sheet_purchase_record pr ON ms.id_ = pr.music_sheet_id_
         WHERE
-            ms.del_flag_=0
+            ms.del_flag_=0 and ms.cbs_music_sheet_id_ is not null
           AND ms.charge_type_='CHARGE'
           AND ms.state_=1
           AND pr.order_status_='PAID'

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

@@ -277,10 +277,10 @@
 				AND p.order_no_ = #{param.orderNo}
 			</if>
 			<if test="param.startTime !=null">
-				<![CDATA[AND p.purchase_time_ >= #{param.startTime} ]]>
+				<![CDATA[AND o.pay_time_ >= #{param.startTime} ]]>
 			</if>
 			<if test="param.endTime !=null">
-				<![CDATA[AND p.purchase_time_ <= #{param.endTime} ]]>
+				<![CDATA[AND o.pay_time_ <= #{param.endTime} ]]>
 			</if>
 	</select>
 	<select id="selectLessonGroup" resultType="com.yonge.cooleshow.biz.dal.vo.LessonGroupVo">