Merge branch 'dev_1_3_3_20220822'

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

@@ -21,4 +21,6 @@ public interface VideoLessonPurchaseRecordDao extends BaseMapper<VideoLessonPurc
 
     //修改订单状态
     void updateStatus(@Param("orderNo") String orderNo,@Param("status") String status);
+    
+    List<VideoLessonPurchaseRecord> queryByVideoLessonGroupId(@Param("videoLessonGroupId") Long videoLessonGroupId, @Param("orderStatus") String orderStatus);
 }

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

@@ -1,15 +1,16 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+
 /**
  * 视频课购买记录表
  * @author yzp

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

@@ -26,6 +26,7 @@ import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupLog;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
@@ -187,6 +188,9 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
         BeanUtils.copyProperties(videoLessonGroupLog, videoLessonGroupVo);
         
         videoLessonGroupVo.setId(videoLessonGroupLog.getVideoLessonGroupId());
+        
+        List<VideoLessonPurchaseRecord> videoLessonPurchaseRecordList = videoLessonPurchaseRecordDao.queryByVideoLessonGroupId(videoLessonGroupLog.getVideoLessonGroupId(), OrderStatusEnum.PAID.getCode());
+        videoLessonGroupVo.setCountStudent(videoLessonPurchaseRecordList.size());
 
         Teacher teacher = teacherService.getById(videoLessonGroupVo.getTeacherId());
         if (teacher != null) {

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

@@ -10,7 +10,7 @@
 		 <result column="purchase_time_" jdbcType="TIMESTAMP" property="purchaseTime" />
 		 <result column="pay_money_" jdbcType="DECIMAL" property="payMoney" />
 		 <result column="order_no_" jdbcType="VARCHAR" property="orderNo" />
-		 <result column="order_status_" jdbcType="TINYINT" property="orderStatus" />
+		 <result column="order_status_" jdbcType="VARCHAR" property="orderStatus" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -29,4 +29,8 @@
 	<update id="updateStatus" parameterType="java.lang.String">
 		UPDATE video_lesson_purchase_record SET order_status_=#{status} WHERE order_no_=#{orderNo}
 	</update>
+	
+	<select id="queryByVideoLessonGroupId" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_group WHERE video_lesson_group_id_ = #{videoLessonGroupId} and order_status_  = #{orderStatus}
+	</select>
 </mapper>