update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupClassGroupMapperDao.java

@@ -3,6 +3,9 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.VipGroupClassGroupMapper;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface VipGroupClassGroupMapperDao extends BaseDAO<Long, VipGroupClassGroupMapper> {
 
@@ -22,4 +25,13 @@ public interface VipGroupClassGroupMapperDao extends BaseDAO<Long, VipGroupClass
 	 */
 	ClassGroup findClassGroupByVipGroup(Long vipGroupId);
 
-}
+	/**
+	 * @describe 根据vip课获取关联的班级
+	 * @author Joburgess
+	 * @date 2019/11/15
+	 * @param vipGroupIds: VIP课编号列表
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroup>
+	 */
+	List<ClassGroup> findClassGroupsByVipGroups(@Param("vipGroupIds") List<Long> vipGroupIds);
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import org.apache.commons.collections.iterators.ObjectGraphIterator;
 
 import java.util.Date;
 import java.util.List;
@@ -293,5 +294,5 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param queryInfo:
 	 * @return com.ym.mec.common.page.PageInfo
 	 */
-	PageInfo findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo);
+	Object findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo);
 }

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

@@ -1102,7 +1102,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public PageInfo findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo) {
+	public Object findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
 		if(Objects.isNull(queryInfo.getVipGroupId())){
@@ -1118,7 +1118,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		List<CourseSchedule> dataList;
-		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
+		if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)){
 			dataList=JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
 		}else{
 			dataList=courseScheduleDao.findVipGroupCourseSchedules(vipGroup.getId());
@@ -1130,6 +1130,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			dataList=dataList.stream().skip(pageInfo.getOffset()).limit(pageInfo.getLimit()).collect(Collectors.toList());
 		}
 		pageInfo.setRows(dataList);
-		return pageInfo;
+		Map<String,Object> result=new HashMap<>();
+		result.put("pageInfo",pageInfo);
+		result.put("singleClassMinutes",vipGroup.getSingleClassMinutes());
+		return result;
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,8 @@ import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.Objects;
+
 @Service
 public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<Integer, VipGroupDefaultClassesUnitPrice>  implements VipGroupDefaultClassesUnitPriceService {
 	
@@ -22,6 +25,9 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 
 	@Override
 	public long insert(VipGroupDefaultClassesUnitPrice bean) {
+		if(Objects.isNull(bean.getOrganId())){
+			throw new BizException("请选择分部");
+		}
 		VipGroupDefaultClassesUnitPrice byVipGroupCategory = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory( bean.getVipGroupCategoryId().longValue(),bean.getOrganId().longValue());
 		if(null!=byVipGroupCategory){
 			return vipGroupDefaultClassesUnitPriceDao.updateByVipGroupCategory(bean);
@@ -29,4 +35,4 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 			return super.insert(bean);
 		}
 	}
-}
+}

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

@@ -382,9 +382,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = vipGroupDao.findAllByOrgan(params);
-			List<Long> vipGroupIds = dataList.stream().map(vipGroup -> vipGroup.getId()).collect(Collectors.toList());
+			List<Long> vipGroupIds = dataList.stream().map(vipGroup -> vipGroup.getId()).distinct().collect(Collectors.toList());
 			List<Map<Long, Integer>> vipGroupOverCourses = vipGroupDao.countVipGroupOverCourse(vipGroupIds);
 			Map<Long,Integer> vipGroupOverCourseMaps = MapUtil.convertIntegerMap(vipGroupOverCourses);
+			List<ClassGroup> classGroupsByVipGroups = vipGroupClassGroupMapperDao.findClassGroupsByVipGroups(vipGroupIds);
+			Map<String, ClassGroup> vipGroupClassGroupMap = classGroupsByVipGroups.stream().collect(Collectors.toMap(ClassGroup::getMusicGroupId, classGroup -> classGroup));
 			dataList.forEach(vipGroup -> {
 				Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getId());
 				if(Objects.isNull(overCourses)){
@@ -403,7 +405,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 						vipGroup.setMonthConsumeRate(monthConsumeRate);
 					}
 
-
+				}
+				ClassGroup classGroup = vipGroupClassGroupMap.get(vipGroup.getId().toString());
+				if(Objects.nonNull(classGroup)){
+					vipGroup.setStudentNum(classGroup.getStudentNum());
+					vipGroup.setTotalClassTimes(classGroup.getTotalClassTimes());
+					vipGroup.setCurrentClassTimes(classGroup.getCurrentClassTimes());
 				}
 
 			});
@@ -736,12 +743,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 
 		Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
-
 		if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
+			classGroup.setDelFlag(YesOrNoEnum.NO);
 			vipGroup.setStatus(VipGroupStatusEnum.FINISH);
 			vipGroupDao.update(vipGroup);
 			createVipGroupCourseScheInfo(vipGroupId);
 		}
+		System.out.println(studentPaymentNum+"------"+JSON.toJSONString(classGroup));
 		classGroupDao.update(classGroup);
 	}
 
@@ -755,8 +763,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyBaseInfoDto.getUserId());
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId,null);
-        classGroup.setDelFlag(YesOrNoEnum.NO);
-        classGroupDao.update(classGroup);
 
 		ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
 
@@ -858,6 +864,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentPaymentOrder.setMusicGroupId(vipGroup.getId().toString());
 		studentPaymentOrder.setClassGroupId(vipGroupClassGroupMapper.getClassGroupId());
 
+		contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+
 		//生成回调地址
 		Map<String,Object> payMap = payService.getPayMap(
 				vipGroup.getTotalPrice(),
@@ -1134,7 +1142,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     	if(Objects.isNull(vipGroup)){
     		throw new BizException("该课程不存在");
 		}
-    	if(vipGroup.getStatus()==VipGroupStatusEnum.FINISH||vipGroup.getStatus()==VipGroupStatusEnum.CANCEL){
+    	if(vipGroup.getStatus()==VipGroupStatusEnum.CANCEL){
     		throw new BizException("该课程已结束或者已被停止,无法进行此操作");
 		}
 		List<CourseSchedule> vipGroupCourseSchedules = courseScheduleDao.findVipGroupCourseSchedules(vipGroupId);
@@ -1150,13 +1158,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     	if(CollectionUtils.isEmpty(maps)||(maps.size()==1&&Objects.isNull(maps.get(0)))){
 			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
 			vipGroupDao.update(vipGroup);
-			courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
-			courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+			if(vipGroup.getStatus().equals(VipGroupStatusEnum.FINISH)){
+				courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
+				courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+			}
 			return;
 		}
 		Map<Integer, BigDecimal> studentSurplusClassFees = MapUtil.convertIntegerMap(maps);
     	for(Integer userId:studentSurplusClassFees.keySet()){
-			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,userId,DealStatusEnum.SUCCESS.getMsg());
+			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId,userId,DealStatusEnum.SUCCESS.getCode());
 			if(null==studentPaymentOrder){
 				throw new BizException("未找到相关订单信息！");
 			}

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

@@ -761,7 +761,24 @@
     </select>
     <select id="findVipGroupCourseSchedules" resultMap="CourseSchedule">
         SELECT
-          cs.*
+            cs.id_,
+            cs.class_group_id_,
+            cs.status_,
+            cs.subsidy_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.start_class_time_ start_class_time_str_,
+            cs.end_class_time_ end_class_time_str_,
+            cs.teacher_id_,
+            cs.create_time_,
+            cs.update_time_,
+            cs.teach_mode_,
+            cs.type_,
+            cs.name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.schoole_id_
         FROM
         	course_schedule cs
             LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cs.class_group_id_

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

@@ -131,7 +131,8 @@
 		LEFT JOIN vip_group_category vgc ON FIND_IN_SET(vgc.id_,vga.vip_group_category_id_list_)
 		<include refid="queryCondition"/>
 		GROUP BY vga.id_
-		ORDER BY id_ <include refid="global.limit"/>
+		ORDER BY id_ DESC
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

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

@@ -78,4 +78,15 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             WHERE vgcgm.vip_group_id_=#{vipGroupId} FOR UPDATE
     </select>
+    <select id="findClassGroupsByVipGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.ClassGroup">
+        SELECT
+            cg.*
+        FROM
+            vip_group_class_group_mapper vgcgm
+            LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+            WHERE vgcgm.vip_group_id_ IN
+            <foreach collection="vipGroupIds" item="vipGroupId" open="(" close=")" separator=",">
+                #{vipGroupIds}
+            </foreach>
+    </select>
 </mapper>

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

@@ -141,15 +141,10 @@
 		SELECT
             vg.*,
             vga.name_ vip_group_activity_name_,
-            su.username_,
-            cg.student_num_,
-            cg.total_class_times_,
-            cg.current_class_times_
+            su.username_
         FROM
             vip_group vg
             LEFT JOIN sys_user su ON vg.user_id_=su.id_
-            LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_=vgcgm.vip_group_id_
-            LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_=vga.id_
         <include refid="vipGroupQueryCondition"/>
         ORDER BY vg.id_ DESC
@@ -579,7 +574,7 @@
         WHERE vg.id_=#{vipGroupId} AND cs.id_!=NULL AND csts.settlement_time_!=NULL AND csts.actual_salary_&lt;csts.expect_salary_
     </select>
 
-    <select id="countSurplusCourseFee" resultType="java.math.BigDecimal">
+    <select id="countSurplusCourseFee" resultType="map">
         SELECT
             cssp.user_id_ as 'key',
             SUM(cssp.expect_price_) as 'value'

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

@@ -26,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -318,7 +319,7 @@ public class StudentOrderController extends BaseController {
 
     }
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void setSuccessStatus() throws Exception {
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -20,11 +20,13 @@ import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -98,8 +100,13 @@ public class CourseScheduleController extends BaseController {
     @ApiOperation(value = "批量删除课程")
     @PostMapping(value = "/bathDelete")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/bathDelete')")
-    public Object bathDelete(List<Long> courseScheduleIds){
-        scheduleService.deleteCourseSchedules(courseScheduleIds);
+    public Object bathDelete(String courseScheduleIds){
+        if(StringUtils.isEmpty(courseScheduleIds)){
+            throw new BizException("请指定课程编号");
+        }
+        long[] ints = Arrays.asList(courseScheduleIds.split(",")).stream().mapToLong(Long::parseLong).toArray();
+        Long[] longs = ArrayUtils.toObject(ints);
+        scheduleService.deleteCourseSchedules(Arrays.asList(longs));
         return succeed();
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesUnitPriceController.java

@@ -1,12 +1,12 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.controller.BaseController;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
+import java.util.Objects;
 
 @Api(tags = "vip课默认单价")
 @RequestMapping("vipGroupDefaultClassesUnitPrice")
@@ -23,6 +24,8 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 
 	@Autowired
 	private VipGroupDefaultClassesUnitPriceService vipGroupDefaultClassesUnitPriceService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
@@ -42,9 +45,16 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 	@PostMapping(value = "/add")
     @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/add')")
 	public Object add(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null){
+			return failed("获取用户信息失败");
+		}
 		Date date = new Date();
 		vipGroupDefaultClassesUnitPrice.setCreateTime(date);
 		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
+		if(Objects.isNull(vipGroupDefaultClassesUnitPrice.getOrganId())){
+			vipGroupDefaultClassesUnitPrice.setOrganId(sysUser.getOrganId());
+		}
 		vipGroupDefaultClassesUnitPriceService.insert(vipGroupDefaultClassesUnitPrice);
 		return succeed();
 	}