|
@@ -97,11 +97,8 @@ public class PhysicalTournamentsServiceImpl implements IPhysicalTournamentsServi
|
|
|
PhysicalItemsPrizeDto itemsPrizeBo = new PhysicalItemsPrizeDto();
|
|
PhysicalItemsPrizeDto itemsPrizeBo = new PhysicalItemsPrizeDto();
|
|
|
itemsPrizeBo.setItemId(physicalTournamentEntryConditionsVo.getItemId());
|
|
itemsPrizeBo.setItemId(physicalTournamentEntryConditionsVo.getItemId());
|
|
|
itemsPrizeBo.setQuantity(physicalTournamentEntryConditionsVo.getRequiredQuantity());
|
|
itemsPrizeBo.setQuantity(physicalTournamentEntryConditionsVo.getRequiredQuantity());
|
|
|
- ItemsVo itemsVo = itemsMapper.selectVoByIdInfo(physicalTournamentEntryConditionsVo.getItemId());
|
|
|
|
|
- if(itemsVo!=null){
|
|
|
|
|
- itemsPrizeBo.setItemsName(itemsVo.getName());
|
|
|
|
|
- itemsConditionList.add(itemsPrizeBo);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ itemsPrizeBo.setItemsName(physicalTournamentEntryConditionsVo.getItemsName());
|
|
|
|
|
+ itemsConditionList.add(itemsPrizeBo);
|
|
|
}
|
|
}
|
|
|
physicalTournamentsVo.setItemsConditionList(itemsConditionList);
|
|
physicalTournamentsVo.setItemsConditionList(itemsConditionList);
|
|
|
}
|
|
}
|
|
@@ -175,11 +172,8 @@ public class PhysicalTournamentsServiceImpl implements IPhysicalTournamentsServi
|
|
|
PhysicalItemsPrizeDto itemsPrizeBo = new PhysicalItemsPrizeDto();
|
|
PhysicalItemsPrizeDto itemsPrizeBo = new PhysicalItemsPrizeDto();
|
|
|
itemsPrizeBo.setItemId(physicalTournamentEntryConditionsVo.getItemId());
|
|
itemsPrizeBo.setItemId(physicalTournamentEntryConditionsVo.getItemId());
|
|
|
itemsPrizeBo.setQuantity(physicalTournamentEntryConditionsVo.getRequiredQuantity());
|
|
itemsPrizeBo.setQuantity(physicalTournamentEntryConditionsVo.getRequiredQuantity());
|
|
|
- ItemsVo itemsVo = itemsMapper.selectVoByIdInfo(physicalTournamentEntryConditionsVo.getItemId());
|
|
|
|
|
- if(itemsVo!=null){
|
|
|
|
|
- itemsPrizeBo.setItemsName(itemsVo.getName());
|
|
|
|
|
- itemsConditionList.add(itemsPrizeBo);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ itemsPrizeBo.setItemsName(physicalTournamentEntryConditionsVo.getItemsName());
|
|
|
|
|
+ itemsConditionList.add(itemsPrizeBo);
|
|
|
}
|
|
}
|
|
|
physicalTournamentsVo.setItemsConditionList(itemsConditionList);
|
|
physicalTournamentsVo.setItemsConditionList(itemsConditionList);
|
|
|
}
|
|
}
|
|
@@ -255,13 +249,10 @@ public class PhysicalTournamentsServiceImpl implements IPhysicalTournamentsServi
|
|
|
if (i > 0) {
|
|
if (i > 0) {
|
|
|
conditionBuilder.append(","); // 使用逗号分隔多个条件
|
|
conditionBuilder.append(","); // 使用逗号分隔多个条件
|
|
|
}
|
|
}
|
|
|
- ItemsVo itemsVo = itemsMapper.selectVoByIdInfo(condition.getItemId());
|
|
|
|
|
- if(itemsVo!=null){
|
|
|
|
|
- condition.setItemsName(itemsVo.getName());
|
|
|
|
|
- conditionBuilder.append(condition.getItemsName())
|
|
|
|
|
- .append("*")
|
|
|
|
|
- .append(condition.getRequiredQuantity());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ condition.setItemsName(condition.getItemsName());
|
|
|
|
|
+ conditionBuilder.append(condition.getItemsName())
|
|
|
|
|
+ .append("*")
|
|
|
|
|
+ .append(condition.getRequiredQuantity());
|
|
|
}
|
|
}
|
|
|
tournamentCondition = conditionBuilder.toString();
|
|
tournamentCondition = conditionBuilder.toString();
|
|
|
}
|
|
}
|
|
@@ -414,6 +405,8 @@ public class PhysicalTournamentsServiceImpl implements IPhysicalTournamentsServi
|
|
|
log.error("报名条件为空");
|
|
log.error("报名条件为空");
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
+ //todo 校验联赛时间 和 当前 开始时间必须大于报名时间
|
|
|
|
|
+
|
|
|
Long userId = LoginHelper.getUserId();
|
|
Long userId = LoginHelper.getUserId();
|
|
|
add.setCreateUserId(userId);
|
|
add.setCreateUserId(userId);
|
|
|
// 处理开始时间
|
|
// 处理开始时间
|
|
@@ -583,6 +576,7 @@ public class PhysicalTournamentsServiceImpl implements IPhysicalTournamentsServi
|
|
|
if(isValid){
|
|
if(isValid){
|
|
|
//TODO 做一些业务上的校验,判断是否需要校验
|
|
//TODO 做一些业务上的校验,判断是否需要校验
|
|
|
}
|
|
}
|
|
|
|
|
+ // todo 需要同步删除
|
|
|
return baseMapper.deletePhysicalTournamentsByIds(ids) > 0;
|
|
return baseMapper.deletePhysicalTournamentsByIds(ids) > 0;
|
|
|
}
|
|
}
|
|
|
|
|
|