Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -128,8 +128,14 @@ public interface CourseGroupService extends IService<CourseGroup> {
     void buyLiveCourseSuccess(UserOrderDetailVo orderParam);
 
     /**
+     * 学生购买直播课程-取消-回调
+     */
+    void buyLiveCourseCancel(UserOrderDetailVo orderParam);
+
+    /**
      * 定时任务-定时修改为报名中状态-每隔10分钟执行一次
      */
     void openCourseGroup();
+
 }
 

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

@@ -652,6 +652,12 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         log.info("buyLiveCourseSuccess ok");
     }
 
+    @Override
+    public void buyLiveCourseCancel(UserOrderDetailVo orderParam) {
+        courseScheduleStudentPaymentService.remove(Wrappers.<CourseScheduleStudentPayment>lambdaQuery()
+                .eq(CourseScheduleStudentPayment::getOrderNo, orderParam.getOrderNo()));
+    }
+
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                 .map(sysUserFeignService::queryUserById)

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

@@ -98,6 +98,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         orderCancel.put(GoodTypeEnum.PRACTICE, scheduleService::buyPracticeCourseFailed);
         //视频课购买
         orderCancel.put(GoodTypeEnum.VIDEO, recordService::buyVideoCourseFailed);
+        //直播课购买
+        orderCancel.put(GoodTypeEnum.LIVE, courseGroupService::buyLiveCourseCancel);
     }
 
     @Override
@@ -287,7 +289,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             //支付成功
             if (PayStatusEnum.succeeded.getCode().equals(resMap.get("status").toString())) {
                 orderSuccess(userOrder);
-            }else{
+            } else {
                 orderCancel(userOrder);
             }
         } catch (Exception e) {
@@ -387,7 +389,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private UserOrderPayment errOrderPayment(HttpResponseResult<Map<String, Object>> responseResult, OrderPayReq payReq) {
         //查询
         UserOrderPayment orderPayment = orderPaymentService.detailByOrderNo(payReq.getOrderNo());
-        if(null == orderPayment){
+        if (null == orderPayment) {
             orderPayment = new UserOrderPayment();
             orderPayment.setOrderNo(payReq.getOrderNo());
             orderPayment.setPayChannel(payReq.getPayChannel());