|
@@ -129,7 +129,47 @@ public class RewardClaimsServiceImpl implements IRewardClaimsService {
|
|
|
@Override
|
|
@Override
|
|
|
public List<RewardClaimsVo> queryList(RewardClaimsBo bo) {
|
|
public List<RewardClaimsVo> queryList(RewardClaimsBo bo) {
|
|
|
LambdaQueryWrapper<RewardClaims> lqw = buildQueryWrapper(bo);
|
|
LambdaQueryWrapper<RewardClaims> lqw = buildQueryWrapper(bo);
|
|
|
- return baseMapper.selectVoList(lqw);
|
|
|
|
|
|
|
+ List<RewardClaimsVo> resultRecords = baseMapper.selectByCriteriaExport(lqw);
|
|
|
|
|
+ //得到比赛名称
|
|
|
|
|
+ TournamentsVo tournamentsVo = tournamentsService.queryById(bo.getTournamentId());
|
|
|
|
|
+ String tournamentName = "";
|
|
|
|
|
+ if(tournamentsVo!=null){
|
|
|
|
|
+ tournamentName = tournamentsVo.getName();
|
|
|
|
|
+ }
|
|
|
|
|
+ for (RewardClaimsVo resultRecord : resultRecords) {
|
|
|
|
|
+ String rewardJson = resultRecord.getRewardJson();
|
|
|
|
|
+ StringBuilder prizeDisplayBuilder = new StringBuilder();
|
|
|
|
|
+ resultRecord.setTournamentId(bo.getTournamentId());
|
|
|
|
|
+ resultRecord.setTournamentName(tournamentName);
|
|
|
|
|
+ if(StringUtils.isNotBlank(rewardJson)){
|
|
|
|
|
+ ObjectMapper mapper = new ObjectMapper();
|
|
|
|
|
+ List<RewardVo> items = null;
|
|
|
|
|
+ try {
|
|
|
|
|
+ items = mapper.readValue(rewardJson, new TypeReference<List<RewardVo>>() {});
|
|
|
|
|
+ } catch (JsonProcessingException e) {
|
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for (RewardVo item : items) {
|
|
|
|
|
+ ItemsVo itemsVo = itemsService.queryById(item.getItemId());
|
|
|
|
|
+ item.setItemName(itemsVo.getName());
|
|
|
|
|
+
|
|
|
|
|
+ // 拼接 name*quantity 格式字符串
|
|
|
|
|
+ if (prizeDisplayBuilder.length() > 0) {
|
|
|
|
|
+ prizeDisplayBuilder.append(",");
|
|
|
|
|
+ }
|
|
|
|
|
+ prizeDisplayBuilder.append(item.getItemName())
|
|
|
|
|
+ .append("*")
|
|
|
|
|
+ .append(item.getQuantity());
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ resultRecord.setRewardJsonText(prizeDisplayBuilder.toString());
|
|
|
|
|
+ resultRecord.setRewardVoList(items);
|
|
|
|
|
+ }
|
|
|
|
|
+ Long isClaimed= resultRecord.getClaimed();
|
|
|
|
|
+ resultRecord.setClaimedText(RewardStatusEnum.getDescriptionByCode(String.valueOf(isClaimed)));
|
|
|
|
|
+ }
|
|
|
|
|
+ return resultRecords;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private LambdaQueryWrapper<RewardClaims> buildQueryWrapper(RewardClaimsBo bo) {
|
|
private LambdaQueryWrapper<RewardClaims> buildQueryWrapper(RewardClaimsBo bo) {
|