Browse Source

活动排课

zouxuan 4 years ago
parent
commit
40122fff24

+ 18 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupDao.java

@@ -413,4 +413,22 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
     * @date 2021/10/12 14:56
     */
     List<StudentVipGroupShowListDto> findPracticeGroups(Map<String, Object> params);
+
+    /**
+    * @description: 获取学生端网管课购买详情
+     * @param groupId
+    * @return com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto
+    * @author zx
+    * @date 2021/10/15 14:36
+    */
+    StudentVipGroupDetailDto getPracticeGroupDetail(Long groupId);
+
+    /**
+    * @description: 统计老师开启的网管课数量
+     * @param teacherId
+    * @return java.lang.Integer
+    * @author zx
+    * @date 2021/10/15 14:44
+    */
+    Integer countTeacherPracticeGroups(Integer teacherId);
 }

+ 19 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupService.java

@@ -369,7 +369,7 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
     * @author zx
     * @date 2021/10/12 18:09
     */
-    Object buyTeacherPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception;
+	HttpResponseResult buyTeacherPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception;
 
     /**
     * @description: 营销活动网管课购买
@@ -379,4 +379,22 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
     * @date 2021/10/13 15:12
     */
 	Object buyActivityPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception;
+
+	/**
+	* @description: 获取学生端网管课购买详情
+	 * @param groupId
+	* @return com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto
+	* @author zx
+	* @date 2021/10/15 14:35
+	*/
+	StudentVipGroupDetailDto getPracticeGroupDetail(Long groupId);
+
+	/**
+	* @description: 获取老师开启的网管课的数量
+	 * @param teacherId
+	* @return java.lang.Integer
+	* @author zx
+	* @date 2021/10/15 14:43
+	*/
+	Integer countTeacherPracticeGroups(Integer teacherId);
 }

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -223,7 +223,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto
      * @describe 学生端获取vip课详情
      */
-    StudentVipGroupDetailDto getVipGroupShowDetail(Long vipGroupId);
+    StudentVipGroupDetailDto getVipGroupShowDetail(Long groupId,String groupType);
 
     /**
      * @Author: Joburgess
@@ -270,7 +270,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return void
      * @describe 购买vip课程
      */
-    Map buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception;
+    HttpResponseResult buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception;
 
     /**
      * @Author: Joburgess

+ 44 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4957,11 +4957,41 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public Object buyTeacherPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception {
+    public HttpResponseResult buyTeacherPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(user == null){
             throw new BizException("用户信息获取失败");
         }
+        // 判断是否存在支付中的记录
+        List<StudentPaymentOrder> list = studentPaymentOrderService
+                .queryByCondition(GroupType.PRACTICE,
+                        practiceGroupBuyParams.getPracticeGroupId().toString(),
+                        user.getId(),
+                        DealStatusEnum.ING,
+                        OrderTypeEnum.PRACTICE_GROUP_BUY);
+        if (list.size() > 0) {
+            StudentPaymentOrder applyOrder = list.get(list.size() - 1);
+            // 查询订单状态
+            PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
+            if(payStatus == PayStatus.SUCCESSED){
+                throw new BizException("订单已支付成功,请勿重复支付");
+            }else if(payStatus == PayStatus.PAYING){
+                throw new BizException("订单还在交易中,请稍后重试");
+            }
+            if(!practiceGroupBuyParams.isRepeatPay()){
+                return BaseController.failed(HttpStatus.CONTINUE, "您有待支付的订单");
+            }
+            //处理关闭订单
+            applyOrder.setStatus(DealStatusEnum.CLOSE);
+            applyOrder.setMemo("关闭网管课订单");
+            if (applyOrder.getBalancePaymentAmount() != null && applyOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
+                sysUserCashAccountService.updateBalance(applyOrder.getUserId(), applyOrder.getBalancePaymentAmount(),
+                        PlatformCashAccountDetailTypeEnum.REFUNDS, "购买网管课支付失败");
+            }
+            studentPaymentOrderService.update(applyOrder);
+            sysCouponCodeService.quit(applyOrder.getCouponCodeId());
+        }
+
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(practiceGroupBuyParams.getPracticeGroupId().toString(),ClassGroupTypeEnum.PRACTICE.getCode());
 
         classGroup = classGroupDao.lockClassGroup(classGroup.getId());
@@ -5043,7 +5073,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 Map<String,Object> result=new HashMap<>();
                 result.put("orderNo",studentPaymentOrder.getOrderNo());
 
-                return result;
+                return BaseController.succeed(result);
+
             }else{
                 if (userCashAccount.getBalance().doubleValue() > 0) {
                     balance = userCashAccount.getBalance();
@@ -5089,7 +5120,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.update(studentPaymentOrder);
-        return payMap;
+        return BaseController.succeed(payMap);
     }
 
     @Override
@@ -5258,4 +5289,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrderService.update(studentPaymentOrder);
         return payMap;
     }
+
+    @Override
+    public StudentVipGroupDetailDto getPracticeGroupDetail(Long groupId) {
+        return practiceGroupDao.getPracticeGroupDetail(groupId);
+    }
+
+    @Override
+    public Integer countTeacherPracticeGroups(Integer teacherId) {
+        return practiceGroupDao.countTeacherPracticeGroups(teacherId);
+    }
 }

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

@@ -1834,26 +1834,44 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
-	public StudentVipGroupDetailDto getVipGroupShowDetail(Long vipGroupId) {
-		if(Objects.isNull(vipGroupId)){
-			throw new BizException("请指定vip课程");
-		}
-		VipGroup vipGroup = vipGroupDao.get(vipGroupId);
-		if(Objects.isNull(vipGroup)){
-			throw new BizException("未找到指定课程");
-		}
-		StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(vipGroupId);
-		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
-			vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class));
-			List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
-					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
-					.collect(Collectors.toList());
-			vipGroupDetail.setCourseSchedules(collect);
-			vipGroupDetail.setTotalClassTimes(collect.size());
+	public StudentVipGroupDetailDto getVipGroupShowDetail(Long groupId,String groupType) {
+		if(Objects.isNull(groupId)){
+			throw new BizException("请指定课程组");
 		}
+		if("PRACTICE".equals(groupType)){
+			PracticeGroup practiceGroup = practiceGroupService.get(groupId);
+			if(Objects.isNull(practiceGroup)){
+				throw new BizException("未找到指定课程组");
+			}
+			StudentVipGroupDetailDto vipGroupDetail = practiceGroupService.getPracticeGroupDetail(groupId);
+			if(StringUtils.isNotEmpty(practiceGroup.getCourseScheduleJson())){
+				vipGroupDetail.setCourseSchedules(JSON.parseArray(practiceGroup.getCourseScheduleJson(),CourseSchedule.class));
+				List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
+						.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+						.collect(Collectors.toList());
+				vipGroupDetail.setCourseSchedules(collect);
+				vipGroupDetail.setTotalClassTimes(collect.size());
+			}
+			vipGroupDetail.setNumberOfClasses(practiceGroupService.countTeacherPracticeGroups(vipGroupDetail.getTeacherId()));
+			return vipGroupDetail;
+		}else {
+			VipGroup vipGroup = vipGroupDao.get(groupId);
+			if(Objects.isNull(vipGroup)){
+				throw new BizException("未找到指定课程");
+			}
+			StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(groupId);
+			if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
+				vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class));
+				List<CourseSchedule> collect = vipGroupDetail.getCourseSchedules().stream()
+						.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+						.collect(Collectors.toList());
+				vipGroupDetail.setCourseSchedules(collect);
+				vipGroupDetail.setTotalClassTimes(collect.size());
+			}
 
-        vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
-        return vipGroupDetail;
+			vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
+			return vipGroupDetail;
+		}
 	}
 
 	private BigDecimal getSalary(VipGroupSalarySettlementTypeDto salarySettlement,TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary,BigDecimal classNum){
@@ -2644,11 +2662,40 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public Map buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception {
+	public HttpResponseResult buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(user == null){
 			throw new BizException("用户信息获取失败");
 		}
+		// 判断是否存在支付中的记录
+		List<StudentPaymentOrder> list = studentPaymentOrderService
+				.queryByCondition(GroupType.VIP,
+						vipGroupBuyParams.getVipGroupId().toString(),
+						vipGroupBuyParams.getUserId(),
+						DealStatusEnum.ING,
+						OrderTypeEnum.SMALL_CLASS_TO_BUY);
+		if (list.size() > 0) {
+			StudentPaymentOrder applyOrder = list.get(list.size() - 1);
+			// 查询订单状态
+			PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
+			if(payStatus == PayStatus.SUCCESSED){
+				throw new BizException("订单已支付成功,请勿重复支付");
+			}else if(payStatus == PayStatus.PAYING){
+				throw new BizException("订单还在交易中,请稍后重试");
+			}
+			if(!vipGroupBuyParams.isRepeatPay()){
+				return BaseController.failed(HttpStatus.CONTINUE, "您有待支付的订单");
+			}
+			//处理关闭订单
+			applyOrder.setStatus(DealStatusEnum.CLOSE);
+			applyOrder.setMemo("关闭VIP订单");
+			if (applyOrder.getBalancePaymentAmount() != null && applyOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
+				sysUserCashAccountService.updateBalance(applyOrder.getUserId(), applyOrder.getBalancePaymentAmount(),
+						PlatformCashAccountDetailTypeEnum.REFUNDS, "购买VIP支付失败");
+			}
+			studentPaymentOrderService.update(applyOrder);
+			sysCouponCodeService.quit(applyOrder.getCouponCodeId());
+		}
 
 		ClassGroup classGroup =classGroupDao.findByMusicGroupAndType(vipGroupBuyParams.getVipGroupId().toString(),ClassGroupTypeEnum.VIP.getCode());
 
@@ -2750,7 +2797,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			this.orderCallback(studentPaymentOrder);
 			Map<String,Object> result=new HashMap<>();
 			result.put("orderNo",studentPaymentOrder.getOrderNo());
-			return result;
+			return BaseController.succeed(result);
 		}else if(vipGroupBuyParams.isUseBalancePayment() || amount.doubleValue() == 0){
 			SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(user.getId());
 			if(userCashAccount == null){
@@ -2774,7 +2821,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				Map<String,Object> result=new HashMap<>();
 				result.put("orderNo",studentPaymentOrder.getOrderNo());
 
-				return result;
+				return BaseController.succeed(result);
 			}else{
 				if (userCashAccount.getBalance().doubleValue() > 0) {
 					balance = userCashAccount.getBalance();
@@ -2802,27 +2849,25 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		classFee.put("instrument",BigDecimal.ZERO);
 		classFee.put("accessories",BigDecimal.ZERO);
 		classFee.put("other",BigDecimal.ZERO);
-			Map<String,Object> payMap = payService.getPayMap(
-					amount,
-					balance,
-					orderNo,
-					baseApiUrl+"/api-student/studentOrder/notify",
-					baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-					"vip课购买",
-					vipGroup.getName(),
-					vipGroup.getOrganId(),
-					"vipBuy"
-			);
-
-			studentPaymentOrder.setOrganId(vipGroup.getOrganId());
-			studentPaymentOrder.setRoutingOrganId(vipGroup.getOrganId());
-			studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
-			studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
-			studentPaymentOrder.setUpdateTime(date);
-			studentPaymentOrderService.update(studentPaymentOrder);
-
-			return payMap;
+		Map<String,Object> payMap = payService.getPayMap(
+				amount,
+				balance,
+				orderNo,
+				baseApiUrl+"/api-student/studentOrder/notify",
+				baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
+				"vip课购买",
+				vipGroup.getName(),
+				vipGroup.getOrganId(),
+				"vipBuy"
+		);
 
+		studentPaymentOrder.setOrganId(vipGroup.getOrganId());
+		studentPaymentOrder.setRoutingOrganId(vipGroup.getOrganId());
+		studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
+		studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
+		studentPaymentOrder.setUpdateTime(date);
+		studentPaymentOrderService.update(studentPaymentOrder);
+		return BaseController.succeed(payMap);
 	}
 
 	@Override

+ 31 - 0
mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -817,4 +817,35 @@
             AND pg.name_ LIKE concat('%',#{search},'%')
         </if>
     </select>
+    <select id="getPracticeGroupDetail" resultMap="com.ym.mec.biz.dal.dao.VipGroupDao.studentVipGroupDetailDto">
+        SELECT pg.name_,pg.total_price_,pg.user_id_,
+               cg.total_class_times_,
+               cg.expect_student_num_,
+               cg.student_num_,
+               su.real_name_                                      teacher_name_,
+               su.avatar_,
+               t.introduction_,
+               cs.id_                                            course_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.teacher_id_,
+               cs.actual_teacher_id_,
+               cs.type_
+        FROM practice_group pg
+                 LEFT JOIN class_group cg ON pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'
+                 LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
+                 LEFT JOIN teacher t ON pg.user_id_ = t.id_
+                 LEFT JOIN sys_user su ON pg.user_id_ = su.id_
+        WHERE pg.id_ = #{groupId}
+        ORDER BY cs.start_class_time_
+    </select>
+    <select id="countTeacherPracticeGroups" resultType="java.lang.Integer">
+        SELECT COUNT(id_)
+        FROM practice_group
+        WHERE user_id_ = #{teacherId}
+    </select>
 </mapper>

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

@@ -393,7 +393,6 @@
         su.avatar_,
         t.introduction_,
         vga.type_,
-        IF(vga.type_='GIVE_CLASS',vga.attribute2_,vga.attribute1_) attribute1_,
         vgc.name_ category_name_,vg.create_time_
         FROM
         vip_group vg

+ 2 - 26
mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -285,32 +285,8 @@ public class PracticeGroupController extends BaseController {
     @ApiOperation(value = "购买指导老师创建的网管课")
     @PostMapping("/buyTeacherPracticeGroup")
     @AuditLogAnnotation(operateName = "购买指导老师创建的网管课")
-    public Object buyTeacherPracticeGroup(PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (null == sysUser) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        if(!practiceGroupBuyParams.isRepeatPay()){
-            // 判断是否存在支付中的记录
-            List<StudentPaymentOrder> list = studentPaymentOrderService
-                    .queryByCondition(GroupType.PRACTICE,
-                            practiceGroupBuyParams.getPracticeGroupId().toString(),
-                            sysUser.getId(),
-                            DealStatusEnum.ING,
-                            OrderTypeEnum.PRACTICE_GROUP_BUY);
-            if (list.size() > 0) {
-                StudentPaymentOrder applyOrder = list.get(list.size() - 1);
-                // 查询订单状态
-                PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
-                if(payStatus == PayStatus.SUCCESSED){
-                    throw new BizException("订单已支付成功,请勿重复支付");
-                }else if(payStatus == PayStatus.PAYING){
-                    throw new BizException("订单还在交易中,请稍后重试");
-                }
-                return failed(HttpStatus.CONTINUE, "您有待支付的订单");
-            }
-        }
-        return succeed(practiceGroupService.buyTeacherPracticeGroup(practiceGroupBuyParams));
+    public Object buyTeacherPracticeGroup(@RequestBody PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception {
+        return practiceGroupService.buyTeacherPracticeGroup(practiceGroupBuyParams);
     }
 
     @ApiOperation("获取用户历史购买的陪练课")

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

@@ -79,7 +79,7 @@ public class StudentVipGroupController extends BaseController {
     }
 
     @ApiOperation(value = "获取可购买vip、网管课列表")
-    @PostMapping(value = "/queryVipPracticeGroups")
+    @RequestMapping(value = "/queryVipPracticeGroups")
     public Object queryVipPracticeGroups(@RequestBody StudentVipGroupQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (null == sysUser) {
@@ -90,10 +90,10 @@ public class StudentVipGroupController extends BaseController {
         return succeed(vipGroupService.queryVipPracticeGroups(queryInfo));
     }
 
-    @ApiOperation(value = "获取学生端vip课显示详情")
-    @GetMapping(value = "/getVipGroupShowDetail")
-    public Object getVipGroupShowDetail(Long vipGroupId){
-        return succeed(vipGroupService.getVipGroupShowDetail(vipGroupId));
+    @ApiOperation(value = "获取学生端vip、网管课显示详情")
+    @RequestMapping(value = "/getVipGroupShowDetail")
+    public Object getVipGroupShowDetail(Long groupId,String groupType){
+        return succeed(vipGroupService.getVipGroupShowDetail(groupId,groupType));
     }
 
     @ApiOperation(value = "检测vip课成能否购买")
@@ -111,31 +111,7 @@ public class StudentVipGroupController extends BaseController {
     @PostMapping("/buyVipGroup")
     @AuditLogAnnotation(operateName = "vip课购买")
     public Object buyVipGroup(VipGroupBuyParamsDto vipGroupBuyParams) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (null == sysUser) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        if(!vipGroupBuyParams.isRepeatPay()){
-            // 判断是否存在支付中的记录
-            List<StudentPaymentOrder> list = studentPaymentOrderService
-                    .queryByCondition(GroupType.VIP,
-                            vipGroupBuyParams.getVipGroupId().toString(),
-                            sysUser.getId(),
-                            DealStatusEnum.ING,
-                            OrderTypeEnum.SMALL_CLASS_TO_BUY);
-            if (list.size() > 0) {
-            	StudentPaymentOrder applyOrder = list.get(list.size() - 1);
-            	// 查询订单状态
-                PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
-                if(payStatus == PayStatus.SUCCESSED){
-            		throw new BizException("订单已支付成功,请勿重复支付");
-            	}else if(payStatus == PayStatus.PAYING){
-            		throw new BizException("订单还在交易中,请稍后重试");
-            	}
-                return failed(HttpStatus.CONTINUE, "您有待支付的订单");
-            }
-        }
-        return succeed(vipGroupService.buyVipGroup(vipGroupBuyParams));
+        return vipGroupService.buyVipGroup(vipGroupBuyParams);
     }
 
     @ApiOperation(value = "vip课退课")