Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into ponline

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

@@ -26,5 +26,6 @@ public interface TeacherTotalDao extends BaseMapper<TeacherTotal>{
      * @return: com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo
 	 */
 	List<TeacherTotalVo> selectPage(@Param("page") IPage page, @Param("param") TeacherTotalSearch teacherTotal);
-	
+
+    void save(@Param("teacherTotal") TeacherTotal teacherTotal);
 }

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

@@ -2360,9 +2360,31 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             return;
         }
         RoomSpeakerInfo roomSpeakerInfo = speakerCache.get();
+        // 设置推流状态房间信息
+        // 查询房间信息
+        LiveRoom imLiveBroadcastRoomVo = getByRoomUid(roomSpeakerInfo.getRoomUid());
 
+        if (imLiveBroadcastRoomVo == null) {
+            log.warn("closeLive imLiveBroadcastRoomVo is null");
+            return;
+        }
         //关闭直播
-        if (StringUtils.isNotBlank(sequence) && sequence.equals(roomSpeakerInfo.getSequence())) {
+        LivePluginService pluginService = livePluginContext.getPluginService(imLiveBroadcastRoomVo.getServiceProvider());
+        if (StringUtils.isBlank(sequence)) {
+            try {
+                TencentWrapper.LiveStreamState liveStreamState = pluginService.liveStreamState(getStreamId(imLiveBroadcastRoomVo.getRoomUid(), imLiveBroadcastRoomVo.getSpeakerId()));
+                if (liveStreamState == null) {
+                    log.error("查询直播间流失败,返回结果为空");
+                } else {
+                    log.info("查询直播间流状态:{},roomUid:{}", JSON.toJSONString(liveStreamState), imLiveBroadcastRoomVo.getRoomUid());
+                    if (!"active".equals(liveStreamState.getStreamState())) {
+                        setPushStatus(roomSpeakerInfo.getRoomUid(), 0);
+                    }
+                }
+            } catch (Exception e) {
+                log.error("查询直播间流失败,roomUid:{}", imLiveBroadcastRoomVo.getRoomUid(), e);
+            }
+        } else if (sequence.equals(roomSpeakerInfo.getSequence())) {
             setPushStatus(roomSpeakerInfo.getRoomUid(), 0);
         }
 

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

@@ -937,6 +937,9 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
         Date date = new Date();
         BigDecimal amount = tenantdivMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
 
+        if (amount.compareTo(BigDecimal.ZERO) <= 0) {
+            return;
+        }
         PlatformCashAccountRecord platformCashAccountRecord = new PlatformCashAccountRecord(userPaymentOrder.getUserId(), amount,
                 InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.valueOf(userPaymentOrder.getOrderType().name()), userPaymentOrder.getBizId(),
                 userPaymentOrder.getOrderNo(), date);

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

@@ -215,7 +215,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Autowired
     private SmsCodeService smsCodeService;
 
-
     @Autowired
     private ImGroupCoreService imGroupCoreService;
 

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

@@ -263,7 +263,7 @@ public class TeacherTotalServiceImpl extends ServiceImpl<TeacherTotalDao, Teache
         if (null != old) {
             updateById(teacherTotal);
         } else {
-            save(teacherTotal);
+            baseMapper.save(teacherTotal);
         }
         return teacherTotal;
     }

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

@@ -311,6 +311,7 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
             tenantInfo.setUsername(applyRecord.getUsername());
             tenantInfo.setPhone(applyRecord.getPhone());
             tenantInfo.setEnableFlag(true);
+            tenantInfo.setBriefIntroduction(applyRecord.getBriefIntroduction());
             tenantInfoService.add(tenantInfo);
         } else {
             tenantApplyRecord.setStatus(AuthStatusEnum.UNPASS);

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

@@ -405,7 +405,7 @@
 	</select>
 	<select id="wechatCompareRecordSum"
 			resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$WechatCompareRecordSumDto">
-		select COUNT(DISTINCT st.user_id_) studentNum,COUNT(DISTINCT DATE_FORMAT(smcr.create_time_,'%Y-%m-%d')) trainDays,SUM(smcr.play_time_) / 60 trainTimes
+		select COUNT(DISTINCT st.user_id_) studentNum,COUNT(DISTINCT DATE_FORMAT(smcr.create_time_,'%Y-%m-%d'),smcr.user_id_) trainDays,SUM(smcr.play_time_) / 60 trainTimes
 		from student st
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
 		<where>

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

@@ -34,4 +34,21 @@
         	<include refid="baseColumns" />
 		FROM teacher_total t
 	</select>
+
+	<insert id="save">
+        insert into teacher_total(user_id_, star_grade_,fans_num_, exp_time_, un_exp_time_, live_flag_, music_album_num_,
+        music_sheet_num_)
+        values
+        (#{teacherTotal.userId},#{teacherTotal.starGrade},#{teacherTotal.fansNum},#{teacherTotal.expTime},#{teacherTotal.unExpTime},
+        #{teacherTotal.liveFlag},#{teacherTotal.musicAlbumNum},#{teacherTotal.musicSheetNum})
+
+        ON DUPLICATE KEY UPDATE
+        star_grade_ = VALUES(star_grade_),
+        fans_num_ = VALUES(fans_num_),
+        exp_time_ = VALUES(exp_time_),
+        un_exp_time_ = VALUES(un_exp_time_),
+        live_flag_ = VALUES(live_flag_),
+        music_album_num_ = VALUES(music_album_num_),
+        music_sheet_num_ = VALUES(music_sheet_num_)
+    </insert>
 </mapper>