Merge branch 'zx_saas_2022-05-13' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -497,7 +497,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             memberRankSettingService.orderCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.ACTIVITY)) {
             //购买活动
-            memberRankSettingService.orderCallback(order);
+            practiceGroupService.activityOrderCallback(order);
         }
     }
 

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

@@ -234,7 +234,9 @@ public class StudentOrderController extends BaseController {
                 orderDetail.put("member", cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId()));
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
-            if (StringUtils.isNotEmpty(orderByOrderNo.getMusicGroupId())) {
+            if(orderByOrderNo.getType() == OrderTypeEnum.ACTIVITY){
+                orderDetail.put("detail", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
+            }else if (StringUtils.isNotEmpty(orderByOrderNo.getMusicGroupId())) {
                 VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
                 orderDetail.put("detail", vipBuyResultInfo);
             }