|
|
@@ -44,6 +44,8 @@ public class AppIsinServiceImpl extends ServiceImpl<AppIsinMapper, AppIsin> impl
|
|
|
private AppSitePlaceMapper appSitePlaceMapper;
|
|
|
@Resource
|
|
|
private AppGamePriceRulesMapper appGamePriceRulesMapper;
|
|
|
+ @Resource
|
|
|
+ private AppCoursesMapper appCoursesMapper;
|
|
|
|
|
|
@Override
|
|
|
public Page<AppIsinVerifyVO> pageAppIsinVerifyRecords(Page<AppIsinVerifyVO> page, String orgCode) {
|
|
|
@@ -108,8 +110,12 @@ public class AppIsinServiceImpl extends ServiceImpl<AppIsinMapper, AppIsin> impl
|
|
|
List<AppGmtInfoVO> appGmtInfoVOList = new ArrayList<>();
|
|
|
List<AppOrderProInfo> appOrderProInfos = appOrderProInfoMapper.selectList(Wrappers.lambdaQuery(AppOrderProInfo.class).eq(AppOrderProInfo::getTicketNo, ticketNo));
|
|
|
for (AppOrderProInfo appOrderProInfo : appOrderProInfos) {
|
|
|
- if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_4) || Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_0)){
|
|
|
- if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_4)){
|
|
|
+ if (Objects.equals(
|
|
|
+ appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_3)
|
|
|
+ || Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_0)
|
|
|
+ || Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_5)){
|
|
|
+ //个人赛
|
|
|
+ if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_3)){
|
|
|
String familyUserId = appOrderProInfo.getFamilyUserId();
|
|
|
List<String> familyIds = Arrays.stream(familyUserId.split(",")).collect(Collectors.toList());
|
|
|
AppOrder appOrder = appOrderMapper.selectById(appOrderProInfo.getOrderId());
|
|
|
@@ -134,6 +140,7 @@ public class AppIsinServiceImpl extends ServiceImpl<AppIsinMapper, AppIsin> impl
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //学校
|
|
|
if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_0)){
|
|
|
String familyUserId = appOrderProInfo.getFamilyUserId();
|
|
|
AppOrder appOrder = appOrderMapper.selectById(appOrderProInfo.getOrderId());
|
|
|
@@ -161,6 +168,33 @@ public class AppIsinServiceImpl extends ServiceImpl<AppIsinMapper, AppIsin> impl
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //课程
|
|
|
+ if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_5)){
|
|
|
+ String familyUserId = appOrderProInfo.getFamilyUserId();
|
|
|
+ AppOrder appOrder = appOrderMapper.selectById(appOrderProInfo.getOrderId());
|
|
|
+ String productIds = appOrder.getProductIds();
|
|
|
+ AppCourses appCourses = appCoursesMapper.selectById(productIds);
|
|
|
+ if (Objects.nonNull(appCourses)){
|
|
|
+ String siteId = appCourses.getAddressSiteId();
|
|
|
+
|
|
|
+ List<AppGmtInfo> appGmtInfos = appGmtInfoMapper.selectList(Wrappers.lambdaQuery(AppGmtInfo.class)
|
|
|
+ .eq(AppGmtInfo::getSiteId, siteId)
|
|
|
+ .eq(AppGmtInfo::getFamilyId, familyUserId).between(AppGmtInfo::getGmtCreate, appCourses.getStartTime(), appCourses.getEndTime()));
|
|
|
+ for (AppGmtInfo appGmtInfo : appGmtInfos) {
|
|
|
+ String familyUserName = familyMembersMapper.selectById(appGmtInfo.getFamilyId()).getFullName();
|
|
|
+ String siteName = appSiteMapper.selectById(appGmtInfo.getSiteId()).getName();
|
|
|
+ AppGmtInfoVO appGmtInfoVO = new AppGmtInfoVO();
|
|
|
+ appGmtInfoVO
|
|
|
+ .setSiteId(appGmtInfo.getSiteId())
|
|
|
+ .setSiteName(siteName)
|
|
|
+ .setFamilyId(appGmtInfo.getFamilyId())
|
|
|
+ .setFamilyUserName(familyUserName)
|
|
|
+ .setGmtCreate(appGmtInfo.getGmtCreate())
|
|
|
+ .setPicUrl(appGmtInfo.getPicUrl());
|
|
|
+ appGmtInfoVOList.add(appGmtInfoVO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
appOrderUseRecordsVO.setAppGmtInfoList(appGmtInfoVOList);
|