|
@@ -210,6 +210,21 @@ public class UserAccountRecordServiceImpl extends ServiceImpl<UserAccountRecordD
|
|
|
bizIds.add(userOrderDetailVo.getBizId());
|
|
|
}
|
|
|
records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(),AccountBizTypeEnum.LIVE, bizIds));
|
|
|
+ }else if(GoodTypeEnum.GROUP.equals(userOrderDetailVo.getGoodType())){
|
|
|
+
|
|
|
+ List<Long> groupId = Arrays.asList(userOrderDetailVo.getBizId());
|
|
|
+ records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(), AccountBizTypeEnum.GROUP_SHARE, groupId));
|
|
|
+
|
|
|
+ if (userOrderDetailVo.getPaymentVersion().equals(EPaymentVersion.V1) || !tenantFlag) {
|
|
|
+ //查询课程组下所有课程id
|
|
|
+ List<CourseSchedule> cancel = courseScheduleService.list(Wrappers.<CourseSchedule>lambdaQuery()
|
|
|
+ .eq(CourseSchedule::getCourseGroupId, userOrderDetailVo.getBizId())
|
|
|
+ );
|
|
|
+ cancel.stream().forEach(o -> bizIds.add(o.getId()));
|
|
|
+ } else {
|
|
|
+ bizIds.add(userOrderDetailVo.getBizId());
|
|
|
+ }
|
|
|
+ records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(),AccountBizTypeEnum.GROUP, bizIds));
|
|
|
}
|
|
|
return records;
|
|
|
}
|