Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -168,4 +168,6 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
                             @Param("avatar") String avatar);
 
     List<SysUser> queryHistoryUserById(@Param("id")Long id);
+
+    Integer getUnCompCourseNum(@Param("userId") Long userId);
 }

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

@@ -253,6 +253,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
     @Override
     public void logoffById(Long id) {
+        //判断用户是否有未结束的课程
+        Integer num = sysUserDao.getUnCompCourseNum(id);
+        if(num>0){
+            throw new BizException("用户有未完成的课程");
+        }
+
         List<SysUser> sysUsers = sysUserDao.queryHistoryUserById(id);
         Integer maxVersion = 0;
         if (!CollectionUtils.isEmpty(sysUsers)) {

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -291,4 +291,10 @@
         where phone_ like CONCAT('%',(select phone_ from sys_user where id_ = #{id} and del_flag_ = 0),'%')
     </select>
 
+    <select id="getUnCompCourseNum" resultType="java.lang.Integer">
+        select count(1) from course_schedule cs
+        where cs.teacher_id_ = #{userId}
+          and status_ in ('NOT_START','ING')
+    </select>
+
 </mapper>

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/PmsProductServiceImpl.java

@@ -200,6 +200,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         //修改sku
         if(CollUtil.isNotEmpty(updateSkuList)){
             for (PmsSkuStock pmsSkuStock : updateSkuList) {
+                pmsSkuStock.setLockStock(null);
                 skuStockMapper.updateByPrimaryKeySelective(pmsSkuStock);
             }
         }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PmsPortalProductController.java

@@ -2,18 +2,26 @@ package com.yonge.cooleshow.portal.controller;
 
 import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
+import com.yonge.cooleshow.mbg.mapper.OmsCartItemMapper;
+import com.yonge.cooleshow.mbg.model.OmsCartItem;
+import com.yonge.cooleshow.mbg.model.OmsCartItemExample;
 import com.yonge.cooleshow.mbg.model.PmsProduct;
+import com.yonge.cooleshow.mbg.model.PmsSkuStock;
 import com.yonge.cooleshow.portal.domain.PmsPortalProductDetail;
 import com.yonge.cooleshow.portal.dto.ProductSearch;
 import com.yonge.cooleshow.portal.dto.ProductSearchConditionVo;
 import com.yonge.cooleshow.portal.service.PmsPortalProductService;
+import com.yonge.cooleshow.portal.service.UmsMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 前台商品管理Controller
@@ -23,10 +31,14 @@ import java.util.List;
 @Api(tags = "PmsPortalProductController 前台商品管理")
 @RequestMapping("/product")
 public class PmsPortalProductController {
-
+    @Autowired
+    private UmsMemberService umsMemberService;
     @Autowired
     private PmsPortalProductService portalProductService;
 
+    @Autowired
+    private OmsCartItemMapper omsCartItemMapper;
+
     @ApiOperation(value = "综合搜索、筛选、排序")
     @RequestMapping(value = "/search", method = RequestMethod.POST)
     @ResponseBody
@@ -51,4 +63,30 @@ public class PmsPortalProductController {
         PmsPortalProductDetail productDetail = portalProductService.detail(id);
         return CommonResult.success(productDetail);
     }
+
+
+    @ApiOperation("购物车数量")
+    @RequestMapping(value = "/cart/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult cart(@PathVariable Long id) {
+        try {
+            OmsCartItemExample omsCartItemExample = new OmsCartItemExample();
+            omsCartItemExample.createCriteria().andProductSkuIdEqualTo(id)
+                              .andHiddenEqualTo(0)
+                              .andDeleteStatusEqualTo(0)
+                              .andMemberIdEqualTo(umsMemberService.getCurrentMember().getId());
+            List<OmsCartItem> omsCartItems = omsCartItemMapper.selectByExample(omsCartItemExample);
+            if (CollectionUtils.isEmpty(omsCartItems)) {
+                return CommonResult.success(0);
+            } else {
+                return CommonResult.success(omsCartItems.get(0).getQuantity());
+
+            }
+        }catch (Exception e) {
+            return CommonResult.success(0);
+        }
+
+
+
+    }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsCartItemServiceImpl.java

@@ -75,7 +75,7 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
             cartItem.setProductBrand(pmsProduct.getName());
             cartItem.setProductSn(pmsProduct.getProductSn());
             if (cartItem.getProductSkuId() != null) {
-                if (pmsSkuStock.getStock() < cartItem.getQuantity()) {
+                if (pmsSkuStock.getStock() - pmsSkuStock.getLockStock() < cartItem.getQuantity()) {
                     throw new BizException("库存不足");
                 }
                 cartItem.setProductSkuCode(pmsSkuStock.getSkuCode());
@@ -87,11 +87,11 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
             cartItemMapper.insert(cartItem);
             return cartItem;
         } else {
-            if (pmsSkuStock.getStock() < existCartItem.getQuantity() + cartItem.getQuantity()) {
+            if (pmsSkuStock.getStock() - pmsSkuStock.getLockStock() < existCartItem.getQuantity() + cartItem.getQuantity()) {
                 throw new BizException("库存不足");
             }
             cartItem.setModifyDate(new Date());
-            existCartItem.setQuantity(existCartItem.getQuantity() + cartItem.getQuantity());
+            existCartItem.setQuantity(cartItem.getQuantity());
             cartItemMapper.updateByPrimaryKey(existCartItem);
         }
         return existCartItem;
@@ -170,14 +170,15 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
 
         PmsSkuStock pmsSkuStock = skuStockMapper.selectByPrimaryKey(omsCartItem.getProductSkuId());
 
-        if (pmsSkuStock.getStock() < quantity) {
-            throw new BizException("库存不足");
+        if (pmsSkuStock.getStock() - pmsSkuStock.getLockStock() < quantity) {
+            return pmsSkuStock.getStock() - pmsSkuStock.getLockStock();
         }
 
         OmsCartItemExample example = new OmsCartItemExample();
         example.createCriteria().andDeleteStatusEqualTo(0)
                 .andIdEqualTo(id).andMemberIdEqualTo(memberId);
-        return cartItemMapper.updateByExampleSelective(cartItem, example);
+        cartItemMapper.updateByExampleSelective(cartItem, example);
+        return pmsSkuStock.getStock() - pmsSkuStock.getLockStock();
     }
 
     @Override

cooleshow-user/user-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mdata/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="/mdata/logs/admin-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

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

@@ -45,7 +45,7 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
 	int countMusicGroupStudentTrainData(Map<String, Object> params);
 
 	/**
-	 * @describe 统计分部云教练新增人数
+	 * @describe 统计分部小酷Ai新增人数
 	 * @author Joburgess
 	 * @date 2021/8/18 0018
 	 * @param organId:

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

@@ -47,15 +47,15 @@ public class Student implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date membershipEndTime;
     /** 
-    * 云教练连续使用天数 
+    * 小酷Ai连续使用天数 
     */
-    @ApiModelProperty("云教练连续使用天数 ")
+    @ApiModelProperty("小酷Ai连续使用天数 ")
 	@TableField(value = "cloud_study_sequence_days_")
     private Integer cloudStudySequenceDays;
     /** 
-    * 云教练最后使用日期 
+    * 小酷Ai最后使用日期 
     */
-    @ApiModelProperty("云教练最后使用日期 ")
+    @ApiModelProperty("小酷Ai最后使用日期 ")
 	@TableField(value = "cloud_study_use_last_day_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")

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

@@ -19,7 +19,7 @@ public class SysMessage extends BaseEntity {
 	@ApiModelProperty("消息配置表id")
 	private Long messageConfigId;
 
-	@ApiModelProperty("TEACHER_AUTH:老师认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱," +
+	@ApiModelProperty("TEACHER_AUTH:达人认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱," +
 			"COURSE:课程,INCOME:收入,HOMEWORK:作业,EVALUATE:评价,GROUP_CHAT:群聊,VIP:会员,NOTICE:公告")
 	private String subType;
 	

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

@@ -78,7 +78,7 @@ public class TeacherAuthEntryRecord implements Serializable {
 	@TableField(value = "teacher_certificate_")
     private String teacherCertificate;
 
-    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
+    @ApiModelProperty("达人认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

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

@@ -33,7 +33,7 @@ public class TeacherAuthMusicianRecord implements Serializable {
 	@TableField(value = "user_id_")
     private Long userId;
 
-    @ApiModelProperty("老师认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
+    @ApiModelProperty("达人认证审核状态 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/FeatureType.java

@@ -3,8 +3,8 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum FeatureType implements BaseEnum<String, FeatureType> {
-    CLOUD_STUDY_TRAIN("云教练训练"),
-    CLOUD_STUDY_EVALUATION("云教练评测");
+    CLOUD_STUDY_TRAIN("小酷Ai训练"),
+    CLOUD_STUDY_EVALUATION("小酷Ai评测");
 
     private String code;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageIconTypeEnum.java

@@ -10,7 +10,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @date 2022-05-09
  */
 public enum MessageIconTypeEnum implements BaseEnum<String, MessageIconTypeEnum> {
-    TEACHER_AUTH("老师认证"),
+    TEACHER_AUTH("达人认证"),
     MUSICIAN_AUTH("音乐人认证"),
     PRACTICE("陪练课"),
     LIVE("直播课"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -26,11 +26,11 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_REVIEW_HOMEWORK("老师点评作业"),
     STUDENT_SUBMIT_HOMEWORK("学员提交作业"),
 
-    TEACHER_AUTH_PASS("老师认证通过"),
-    SMS_TEACHER_AUTH_PASS("老师认证通过(短信)"),
+    TEACHER_AUTH_PASS("达人认证通过"),
+    SMS_TEACHER_AUTH_PASS("达人认证通过(短信)"),
 
-    TEACHER_AUTH_FAIL("老师认证失败"),
-    SMS_TEACHER_AUTH_FAIL("老师认证失败(短信)"),
+    TEACHER_AUTH_FAIL("达人认证失败"),
+    SMS_TEACHER_AUTH_FAIL("达人认证失败(短信)"),
 
     MUSICIAN_AUTH_PASS("音乐人认证通过"),
     SMS_MUSICIAN_AUTH_PASS("音乐人认证通过(短信)"),

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

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
@@ -30,6 +32,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
 
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     @Override
     public BaseDAO<Long, Employee> getDAO() {
@@ -62,6 +66,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
             String password = param.getPhone().substring(param.getPhone().length() - 6);
             sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
             sysUser.setGender(param.getGender().getCode());
+
+            String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD);
+            sysUser.setAvatar(defaultHeard);
+
             sysUser.setCreateTime(new Date());
             sysUser.setUpdateTime(new Date());
             employeeDao.insertSysUser(sysUser);

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

@@ -199,7 +199,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             detail.setPlay(YesOrNoEnum.YES);
         }
         if (SysUserType.STUDENT.getCode().equals(userType.getCode())) {
-            // 学生进入云教练练习，添加一条练习记录
+            // 学生进入小酷Ai练习，添加一条练习记录
             musicSheetPracticeRecordService.addRecord(id, sysUser.getId());
         }
         return detail;

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

@@ -62,6 +62,7 @@ public class StudentTimeServiceImpl extends ServiceImpl<StudentTimeDao, StudentT
             StudentTime studentTime = studentTimeMap.get(userOrder.getUserId());
             if (null == studentTime) {
                 studentTime = new StudentTime();
+                studentTime.setUserId(userOrder.getUserId());
             }
 
             List<UserOrderDetailVo> orderDetilListByOrderNo = orderDetailService.getOrderDetilListByOrderNo(userOrder.getOrderNo());
@@ -83,8 +84,9 @@ public class StudentTimeServiceImpl extends ServiceImpl<StudentTimeDao, StudentT
                     studentTime.setFirstMusicTime(now);
                 }
             }
-            if (null == studentTime.getUserId()) {
-                studentTime.setUserId(userOrder.getUserId());
+
+            StudentTime old = baseMapper.selectById(userOrder.getUserId());
+            if (null == old) {
                 baseMapper.insert(studentTime);
             } else {
                 baseMapper.updateById(studentTime);
@@ -121,14 +123,15 @@ public class StudentTimeServiceImpl extends ServiceImpl<StudentTimeDao, StudentT
             StudentTime studentTime = mallStudentTimeMap.get(userId);
             if (null == studentTime) {
                 studentTime = new StudentTime();
+                studentTime.setUserId(userId);
             }
 
             if (null == studentTime.getFirstMallTime()) {
                 studentTime.setFirstMallTime(timeMap.get(userId));
             }
 
-            if (null == studentTime.getUserId()) {
-                studentTime.setUserId(userId);
+            StudentTime old = baseMapper.selectById(userId);
+            if (null == old) {
                 baseMapper.insert(studentTime);
             } else {
                 baseMapper.updateById(studentTime);

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

@@ -311,6 +311,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         } else if (!sysUser.getUserType().contains("TEACHER")) {
             sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
         }
+        //设置默认头像
+        if(StringUtil.isEmpty(sysUser.getAvatar())){
+            String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD);
+            sysUser.setAvatar(defaultHeard);
+        }
+
         sysUser.setUsername(teacherSubmitReq.getUsername());
         sysUser.setPhone(teacherSubmitReq.getPhone());
         return sysUser;

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

@@ -19,7 +19,7 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("曲谱伴奏")
     private List<MusicSheetAccompaniment> background;
 
-    @ApiModelProperty("是否能播放（0：否，1：是） 学生端进入云教练判断 试用/完整 播放")
+    @ApiModelProperty("是否能播放（0：否，1：是） 学生端进入小酷Ai判断 试用/完整 播放")
     private YesOrNoEnum play;
 
     @ApiModelProperty("订单状态(WAIT_PAY:待支付;PAYING:支付中,PAID:已付款)")

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

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "HomeUserToDoNum", description = "后台首页待办事项统计查询对象")
 public class HomeUserToDoNum {
-    @ApiModelProperty("待审核老师认证数 ")
+    @ApiModelProperty("待审核达人认证数 ")
     private Integer entryNum;
     @ApiModelProperty("待审核音乐认证人数 ")
     private Integer musicianNum;

cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl

@@ -103,10 +103,12 @@
                 </#if>-->
             </div>
         </div>
+<#--
         <div>（本协议中“乙方“指学员及家长；”乙方学员“指购买甲方产品或服务的学员；”乙方家长“仅指乙方学员的法定监护人。）</div>
+-->
 
         <#--<p class="underline bold">重要须知：在注册或购买使用甲方提供的产品、服务之前，请您务必审慎阅读、充分理解本使用协议各条款内容， 特别是免除或者限制甲方责任的条款、对您权利进行限制的条款、约定争议解决方式和司法管辖的条款等。 限制、免责条款或者其他涉及您重大权益的条款可能以加粗、加下划线等形式提示您重点注意。您注册或购买使用甲方提供的产品和服务，均视为您同意本使用协议，以及同意接受本使用协议的约束。</p>
-        <p class="underline bold">如无特别说明 ，下列术语在本协议中的定义为：管乐迷平台（下称“本平台”），即管乐迷APP；（下称“本平台”）指由甲方提供的器乐教学全流程辅助系统，包括媒体资料，教师点评，课前、课中、课后管理等服务；乐器练习云教练 （下称“本系统”），指由甲方提供和维护的器乐辅助练习系统；具体以该系统实际提供为准。该系统将根据实际需要进行调整和增减，乙方使用平台时需遵守本服务协议。</p>-->
+        <p class="underline bold">如无特别说明 ，下列术语在本协议中的定义为：管乐迷平台（下称“本平台”），即管乐迷APP；（下称“本平台”）指由甲方提供的器乐教学全流程辅助系统，包括媒体资料，教师点评，课前、课中、课后管理等服务；乐器练习小酷Ai （下称“本系统”），指由甲方提供和维护的器乐辅助练习系统；具体以该系统实际提供为准。该系统将根据实际需要进行调整和增减，乙方使用平台时需遵守本服务协议。</p>-->
 
 		${contractMainContent!}
         

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

@@ -122,6 +122,7 @@
                        left join user_order_detail as d on d.order_no_ = x.order_no_
               where x.user_id_ = #{param.studentId}) as y on b.id_ = y.course_group_id_
         <where>
+            u.del_flag_ = 0
             <if test="param.teacherId != null">
                 and b.teacher_id_ = #{param.teacherId}
             </if>

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

@@ -591,7 +591,7 @@
         FROM course_group g
         LEFT JOIN sys_user u ON g.teacher_id_=u.id_
         LEFT JOIN subject s ON g.subject_id_=s.id_
-        WHERE type_='LIVE' and g.status_ = 'APPLY' and #{appAuditVersion} = g.audit_version_
+        WHERE u.del_flag_ = 0 and type_='LIVE' and g.status_ = 'APPLY' and #{appAuditVersion} = g.audit_version_
         ORDER BY courseStartTime DESC LIMIT 4
     </select>
     <select id="selectVideo" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$Video">
@@ -613,7 +613,7 @@
         LEFT JOIN sys_user u ON g.teacher_id_=u.id_
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
         LEFT JOIN (SELECT video_lesson_group_id_ ,COUNT(1) AS count_ FROM video_lesson_purchase_record WHERE order_status_='PAID' GROUP BY video_lesson_group_id_) r ON g.id_= r.video_lesson_group_id_
-        WHERE g.audit_status_='PASS' and #{appAuditVersion} = g.audit_version_
+        WHERE u.del_flag_ = 0 and g.audit_status_='PASS' and #{appAuditVersion} = g.audit_version_
         ORDER BY g.create_time_ DESC LIMIT 4
     </select>
     <select id="selectRecentCourses" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$RecentCourses">

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

@@ -4,11 +4,19 @@
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.HomeDao">
 	<select id="getUserToDoNum" resultType="com.yonge.cooleshow.biz.dal.vo.res.HomeUserToDoNum">
 		select
-			(select count(1) from teacher_auth_entry_record where teacher_auth_status_ = 'DOING') as entryNum,
-			(select count(1) from teacher_auth_musician_record where teacher_auth_status_ = 'DOING') as musicianNum,
-        	(select count(1) from music_sheet where del_flag_ = 0 and audit_status_ = 'DOING') as musicNum,
+			(select count(1) from teacher_auth_entry_record a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.teacher_auth_status_ = 'DOING') as entryNum,
+			(select count(1) from teacher_auth_musician_record a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.teacher_auth_status_ = 'DOING') as musicianNum,
+        	(select count(1) from music_sheet a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.del_flag_ = 0 and a.audit_status_ = 'DOING') as musicNum,
         	(select count(1) from video_lesson_auth_record where audit_status_ = 'DOING') as videoCourseNum,
-			(select count(1) from teacher_style_video where del_flag_ = 0 and auth_status_ = 'DOING') as styleNum
+			(select count(1) from teacher_style_video a
+				left join sys_user u on a.user_id_ = u.id_
+			 	where u.del_flag_ =0 and a.del_flag_ = 0 and a.auth_status_ = 'DOING') as styleNum
         from dual
 	</select>
 

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

@@ -197,7 +197,7 @@
 
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
-		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		WHERE user_id_ = #{userId} AND read_status_ = 0
 		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &lt;= now()
 		<if test="type != null">
 		and type_ = #{type}

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

@@ -248,6 +248,7 @@
 		LEFT JOIN sys_user u ON g.teacher_id_=u.id_
 		LEFT JOIN `subject` s ON g.lesson_subject_ = s.id_
 		<where>
+		    u.del_flag_ = 0
 			<if test="null != param.search and '' != param.search">
 				AND (
 				u.username_ LIKE CONCAT('%', #{param.search}, '%') OR
@@ -258,7 +259,7 @@
 				AND g.audit_status_ = #{param.auditStatus}
 			</if>
 			<if	test="param.studentId != null">
-				g.id_ IN
+				AND g.id_ IN
 				(SELECT video_lesson_group_id_ FROM video_lesson_purchase_record WHERE student_id_=#{param.studentId} AND order_status_='PAID')
 			</if>
 			<if	test="param.teacherId != null">

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

@@ -29,7 +29,7 @@ import com.yonge.toolset.base.exception.BizException;
  * @Author Joburgess
  * @Date 2021/8/13 0013
  */
-@Api(tags = "云教练记录")
+@Api(tags = "小酷Ai记录")
 @RequestMapping("sysMusicRecord")
 @RestController
 public class SysMusicCompareRecordController extends BaseController {