记得上下班打卡 | git大法好,push需谨慎

Commit d6e5d2a5 authored by wanglele's avatar wanglele

兑换活动增加uid

parent af4576ef
...@@ -124,7 +124,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService { ...@@ -124,7 +124,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName()); goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
break; break;
} else { } else {
if (gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) { if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) {
goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName()); goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
break; break;
} }
...@@ -171,7 +171,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService { ...@@ -171,7 +171,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
} }
} }
PageInfoVo pageInfo = new PageInfoVo(goblinNftExCodeArrayList, count,""); PageInfoVo pageInfo = new PageInfoVo(goblinNftExCodeArrayList, count, "");
return pageInfo; return pageInfo;
} }
...@@ -328,7 +328,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService { ...@@ -328,7 +328,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
goblinNftExCodeArrayList.add(goblinNftExCodeVo); goblinNftExCodeArrayList.add(goblinNftExCodeVo);
break; break;
} else { } else {
if (gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) { if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) {
goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName()); goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
goblinNftExCodeArrayList.add(goblinNftExCodeVo); goblinNftExCodeArrayList.add(goblinNftExCodeVo);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment