Merge branch 'course_link' into pre

# Conflicts:
#	netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1296,6 +1296,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				} else if (GroupsTrips.Status.waiting.equals(groupsTrips.getStatus())) {
 					log.info("车位groupsId:{}未发车,修改订单号orderNo:{}订单为已付款状态:{}", groupsTrips.getId(), order.getOrderNo());
 					order.setStatus(OrderDon.Status.hasPayment);
+					if (goodsDon.getSpecialType() != null && goodsDon.getSpecialType() == GoodsDon.SpecialType.courseware) {
+						order.setStatus(OrderDon.Status.complete);
+					}
 				}
 				//下架POE会员车队
 				if (order.getGoodsId() != null && order.getGoodsId().equals(35l)) {

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -550,9 +550,9 @@ public class GroupRelationController {
     public Result<GoodsCoursewareFile> getGoodsCourseware(Long relationId) {
         long userId = StpUserUtil.getLoginIdAsLong();
         List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-        GroupsRelationView relationView = beanSearcher.searchFirst(GroupsRelationView.class, MapUtils.builder()
-                .field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
-                .field(GroupsRelationView::getId, relationId).build());
+        RenewalView relationView = beanSearcher.searchFirst(RenewalView.class, MapUtils.builder()
+                .field(RenewalView::getUserId, userIdList).op(Operator.InList)
+                .field(RenewalView::getRelationId, relationId).build());
         if (relationView == null) {
             throw BusinessRuntimeException.getInstance("您的车票不存在");
         }