浏览代码

fix:老师直播课

liujunchi 3 年之前
父节点
当前提交
79824d31cb

+ 22 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupStudentVo.java

@@ -16,6 +16,9 @@ import java.util.Date;
 @ApiModel("直播课签署学生信息")
 public class LiveCourseGroupStudentVo {
 
+    @ApiModelProperty("支付记录id")
+    private Long paymentId;
+
     @ApiModelProperty("学生id")
     private Long studentId;
 
@@ -32,6 +35,9 @@ public class LiveCourseGroupStudentVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
 
+    @ApiModelProperty("学生手机号")
+    private String phone;
+
 
     public Long getStudentId() {
         return studentId;
@@ -72,4 +78,20 @@ public class LiveCourseGroupStudentVo {
     public void setPayTime(Date payTime) {
         this.payTime = payTime;
     }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Long getPaymentId() {
+        return paymentId;
+    }
+
+    public void setPaymentId(Long paymentId) {
+        this.paymentId = paymentId;
+    }
 }

+ 11 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupVo.java

@@ -57,6 +57,9 @@ public class LiveCourseGroupVo {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
     public Long getCourseNum() {
         return courseNum;
     }
@@ -160,4 +163,12 @@ public class LiveCourseGroupVo {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
 }

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

@@ -156,8 +156,10 @@
         cg.course_num_ as courseNum,
         cg.created_time_ as createTime,
         cg.course_introduce_ as courseIntroduce,
-        cg.im_group_id_  as imGroupId,
-        su.phone_ as phone
+        <if test="param.studentId != null">
+            cssp.order_no_ as orderNo,
+        </if>
+        cg.im_group_id_  as imGroupId
         from course_group cg
         left join course_schedule_student_payment cssp on cg.id_ = cssp.course_group_id_
         left join sys_user su on su.id_ = cssp.user_id_
@@ -216,10 +218,12 @@
 
     <select id="selectAdminLiveStudentPage" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseGroupStudentVo">
         select
+        cssp.id_ as paymentId,
         su.id_ as studentId,
         su.username_ as studentName,
         cssp.actual_price_ as price,
         cssp.order_no_ as orderNo,
+        su.phone_ as phone,
         cssp.created_time_ as payTime
         from course_schedule_student_payment cssp
         left join sys_user su on cssp.user_id_ = su.id_