update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -39,6 +39,17 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "教师角色")
     private TeachTypeEnum teacherRole;
 
+    @ApiModelProperty(value = "投诉状态")
+    private Integer complaintStatus;
+
+    public Integer getComplaintStatus() {
+        return complaintStatus;
+    }
+
+    public void setComplaintStatus(Integer complaintStatus) {
+        this.complaintStatus = complaintStatus;
+    }
+
     public TeachTypeEnum getTeacherRole() {
         return teacherRole;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentVipGroupQueryInfo.java

@@ -15,6 +15,17 @@ public class StudentVipGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程类型",required = false)
     private String classType;
 
+    @ApiModelProperty(value = "学生编号")
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getSubjectId() {
         return subjectId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -44,11 +44,11 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		}
 
 		//获取活动信息
-		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroupId.intValue());
+		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroupApplyBaseInfoDto.getVipGroupActivityId().intValue());
 
 		List<CourseSchedule> vipGroupCourseSchedules=courseScheduleDao.findVipGroupCourseSchedules(vipGroupId);
 		if(CollectionUtils.isEmpty(vipGroupCourseSchedules)){
-			throw new BizException("为获取到排课信息");
+			throw new BizException("未获取到排课信息");
 		}
 		List<CourseScheduleStudentPayment> courseScheduleStudentPayments=new ArrayList<>();
 		Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipGroupCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
@@ -59,6 +59,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			for(int i=0;i<courseSchedules.size();i++) {
 				//创建学生课程应缴费记录
 				CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+				courseScheduleStudentPayment.setUserId(userId);
 				courseScheduleStudentPayment.setCourseScheduleId(courseSchedules.get(i).getId());
 				courseScheduleStudentPayment.setClassGroupId(courseSchedules.get(i).getClassGroupId());
 
@@ -112,8 +113,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 						default:
 							throw new BizException("活动类型错误!");
 					}
-					courseScheduleStudentPayments.add(courseScheduleStudentPayment);
 				}
+				courseScheduleStudentPayments.add(courseScheduleStudentPayment);
 			}
 		}
 		return courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -347,6 +347,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		List dataList = null;
 		int count = vipGroupDao.countVipGorups(params);
 		if (count > 0) {
+
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = vipGroupDao.findVipGroups(params);
@@ -777,7 +778,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Map payMap = payService.getPayMap(
 				vipGroup.getTotalPrice(),
 				orderNo,
-				"https://47.99.212.176/api-student/studentOrder/notify",
+				"https://dyme.utools.club/api-student/studentOrder/notify",
 				"https://dyme.utools.club/paymentresult",
 				"vip课购买",
 				vipGroup.getName());
@@ -834,12 +835,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		VipGroupClassGroupMapper vipGroupClassGroupMapper = vipGroupClassGroupMapperDao.findByVipGroupId(vipGroupId);
 
-		//更新订单状态
-		StudentPaymentOrder studentPaymentOrder=studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,userId);
-		studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-		studentPaymentOrderDao.update(studentPaymentOrder);
-
 		ClassGroupStudentMapper classGroupStudentMapper=new ClassGroupStudentMapper(vipGroupClassGroupMapper.getClassGroupId(),userId.intValue());
+		classGroupStudentMapper.setMusicGroupId(vipGroupId.toString());
 		classGroupStudentMapperDao.insert(classGroupStudentMapper);
 
 		//更新所属分部列表

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -36,6 +36,8 @@
         <result column="seal_class_id_" property="sealClassId"/>
         <result column="total_student_num_" property="totalStudentNum"/>
         <result column="teacher_role_" property="teacherRole" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="attendance_status_" property="attendanceStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaint_status_" property="complaintStatus"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentCourseScheduleRecordDto" id="studentCourseScheduleRecord">
@@ -406,11 +408,13 @@
         cs.status_,
         su.username_ teacher_name_,
         cgsm.status_ attendance_status_,
+        csc.id_ IS NOT NULL complaint_status_,
         cs.teach_mode_
         FROM
         course_schedule_student_payment cssp
 	    LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
         LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
+        LEFT JOIN course_schedule_complaints csc ON csc.course_schedule_id_=cssp.course_schedule_id_ AND csc.user_id_=#{studentId}
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.class_group_id_ = cs.class_group_id_ AND cgsm.user_id_=#{studentId}
         WHERE
         cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
@@ -746,10 +750,10 @@
     </select>
     <select id="findVipGroupCourseSchedules" resultMap="CourseSchedule">
         SELECT
-        cs.*
+          cs.*
         FROM
-        vip_group_class_group_mapper vgcgm
-        LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
+        	course_schedule cs
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cs.class_group_id_
         WHERE
         vgcgm.vip_group_id_ =#{vipGroupId}
     </select>
@@ -1047,7 +1051,7 @@
     </select>
     <select id="queryMusicGroupIds" resultType="java.lang.String">
         SELECT DISTINCT spo.music_group_id_ FROM student_payment_order spo
-        WHERE spo.type_ != 'OTHER' AND spo.music_group_id_ IS NOT NULL AND spo.user_id_ = #{userId} AND spo.type_='SUCCESS'
+        WHERE spo.type_ != 'OTHER' AND spo.music_group_id_ IS NOT NULL AND spo.user_id_ = #{userId} AND spo.status_='SUCCESS'
         <include refid="global.limit"/>
     </select>
     <select id="countExistRepeatInDateZone" resultType="int">

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -263,6 +263,7 @@
             vg.status_!=3
             AND vg.audit_status_='PASS'
             AND vg.status_=1
+            AND (select count(1) as num from student_vip_group_payment where vg.id_ = vip_group_id_ AND user_id_=#{userId}) = 0
             <if test="subjectId!=null">
                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_)
             </if>

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -240,7 +240,7 @@ public class MusicGroupController extends BaseController {
         Map payMap = payService.getPayMap(
                 orderAmount,
                 orderNo,
-                "http://47.99.212.176/api-student/studentOrder/notify",
+                "http://mstudev.dayaedu.com/api-student/studentOrder/notify",
                 "http://mstudev.dayaedu.com/#/paymentResult",
                 "测试订单",
                 "测试订单");

mec-student/src/main/java/com/ym/mec/student/controller/StudentVipGroupController.java

@@ -54,6 +54,11 @@ public class StudentVipGroupController extends BaseController {
     @ApiOperation(value = "获取vip课列表")
     @PostMapping(value = "/queryVipGroups")
     public Object queryVipGroups(@RequestBody StudentVipGroupQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (null == sysUser) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        queryInfo.setUserId(sysUser.getId());
         Map<String,Object> result=new HashMap<>();
         result.put("recommendVipGroups",new ArrayList<>());
         result.put("pageInfo",vipGroupService.findStudentVipGroupList(queryInfo));