|
|
@@ -118,6 +118,24 @@ public class CommercialController {
|
|
|
}
|
|
|
List<AppCoursesVerificationRecord> verificationRecords =
|
|
|
appCoursesVerificationRecordService.courseQueryUsersList(form.getCoursePriceRulesId(),form.getOrPostpone(), form.getVerifyStatus(),loginUser.getId());
|
|
|
+ //排除已退款的子订单用户
|
|
|
+ List<AppCoursesVerificationRecord> removes = new ArrayList<>();
|
|
|
+ for (AppCoursesVerificationRecord verificationRecord : verificationRecords) {
|
|
|
+ if (ObjectUtil.isNotEmpty(verificationRecord.getOrderId())) {
|
|
|
+ AppOrder appOrder = appOrderService.getById(verificationRecord.getOrderId());
|
|
|
+ //查询退款子订单
|
|
|
+ List<AppOrderProInfo> orderProInfoList = appOrderProInfoService.list(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, appOrder.getId()).in(AppOrderProInfo::getOrderStatus, 5, 6));
|
|
|
+ if (ObjectUtil.isNotEmpty(orderProInfoList)) {
|
|
|
+ for (AppOrderProInfo orderProInfo : orderProInfoList) {
|
|
|
+ if (orderProInfo.getFamilyUserId().equals(verificationRecord.getUseUserId())) {
|
|
|
+ removes.add(verificationRecord);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ verificationRecords.removeAll(removes);
|
|
|
+
|
|
|
List<AppCoursesVerificationRecord> temporaryCourseList =
|
|
|
appCoursesVerificationRecordService.queryTemporaryCourseUser(form.getCoursePriceRulesId(),form.getOrPostpone(),form.getVerifyStatus(),loginUser.getId());
|
|
|
verificationRecords.addAll(temporaryCourseList);
|