|
@@ -111,8 +111,10 @@ public class RewardClaimsServiceImpl implements IRewardClaimsService {
|
|
|
List<RewardVo> items = mapper.readValue(rewardJson, new TypeReference<List<RewardVo>>() {});
|
|
List<RewardVo> items = mapper.readValue(rewardJson, new TypeReference<List<RewardVo>>() {});
|
|
|
for (RewardVo item : items) {
|
|
for (RewardVo item : items) {
|
|
|
ItemsVo itemsVo = itemsService.queryById(item.getItemId());
|
|
ItemsVo itemsVo = itemsService.queryById(item.getItemId());
|
|
|
- item.setItemName(itemsVo.getName());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if(itemsVo!=null){
|
|
|
|
|
+ item.setItemName(itemsVo.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
resultRecord.setRewardVoList(items);
|
|
resultRecord.setRewardVoList(items);
|
|
|
}
|
|
}
|
|
|
Long isClaimed= resultRecord.getClaimed();
|
|
Long isClaimed= resultRecord.getClaimed();
|
|
@@ -153,7 +155,10 @@ public class RewardClaimsServiceImpl implements IRewardClaimsService {
|
|
|
|
|
|
|
|
for (RewardVo item : items) {
|
|
for (RewardVo item : items) {
|
|
|
ItemsVo itemsVo = itemsService.queryById(item.getItemId());
|
|
ItemsVo itemsVo = itemsService.queryById(item.getItemId());
|
|
|
- item.setItemName(itemsVo.getName());
|
|
|
|
|
|
|
+ if(itemsVo!=null){
|
|
|
|
|
+ item.setItemName(itemsVo.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
// 拼接 name*quantity 格式字符串
|
|
// 拼接 name*quantity 格式字符串
|
|
|
if (prizeDisplayBuilder.length() > 0) {
|
|
if (prizeDisplayBuilder.length() > 0) {
|