批量空投

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExCodeVo.java

@@ -149,6 +149,12 @@ public class GoblinNftExCodeVo implements Serializable, Cloneable {
      */
     @ApiModelProperty(position = 26,required = true,value ="sku名称")
     private String skuName;
+    /**
+     * 兑换结果sku名称
+     */
+    @ApiModelProperty(position = 27,required = true,value = "兑换结果sku名称")
+    private String resultSkuName;
+
 
     /**
      * 是否盲和

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java

@@ -106,10 +106,9 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         StringBuffer skuIds = new StringBuffer();
         StringBuffer acticityIds = new StringBuffer();
         for (GoblinNftExCode gnc : goblinNftExCodes) {
+            skuIds.append(gnc.getSkuId()).append(",");
             if (StringUtil.isNotBlank(gnc.getBoxSkuId())) {
                 skuIds.append(gnc.getBoxSkuId()).append(",");
-            } else {
-                skuIds.append(gnc.getSkuId()).append(",");
             }
             acticityIds.append(gnc.getActivityId()).append(",");
         }
@@ -123,15 +122,18 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             for (GoblinNftExCode gnc : goblinNftExCodes) {
                 GoblinNftExCodeVo goblinNftExCodeVo = GoblinNftExCodeVo.getNew().copy(gnc);
                 for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
-                    if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getBoxSkuId().equals(goblinGoodsSku.getSkuId())) {
+                    if (goblinNftExCodeVo.getSkuId().equals(goblinGoodsSku.getSkuId())) {
                         goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
-                        break;
-                    } else {
-                        if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) {
-                            goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
-                            break;
+                    }
+
+                    if (gnc.getState().equals(2)) {
+                        if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getBoxSkuId().equals(goblinGoodsSku.getSkuId())) {
+                            goblinNftExCodeVo.setResultSkuName(goblinGoodsSku.getName());
+                        } else if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())){
+                            goblinNftExCodeVo.setResultSkuName(goblinGoodsSku.getName());
                         }
                     }
+
                 }
                 goblinNftExCodeArrayList.add(goblinNftExCodeVo);
             }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeTaskServiceImpl.java

@@ -92,7 +92,6 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
             goblinNftExSku.setExStopTime(goblinNftExCodeTask.getExStopTime());
             goblinNftExSku.setCreatedAt(now);
             goblinNftExSkus.add(goblinNftExSku);
-
             updTaskIds.append(goblinNftExCodeTask.getTaskId()).append(",");
 
             switch (goblinNftExCodeTask.getUnbox()) {
@@ -131,33 +130,8 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
 
                                 goblinNftExCodes.add(goblinNftExCode);
                             }
-
-
-                            if (goblinNftExCodeTaskHashMap.get(goblinNftExCodeTask.getSkuId()) == null) {
-                                goblinNftExCodeTaskHashMap.put(goblinNftExCodeTaskRelation.getSkuId(), goblinNftExCodeTask);
-                            } else {
-                                GoblinNftExCodeTask nftExCodeTask = goblinNftExCodeTaskHashMap.get(goblinNftExCodeTask.getSkuId());
-                                LocalDateTime exStartTime = nftExCodeTask.getExStartTime();
-                                LocalDateTime exStopTime = nftExCodeTask.getExStopTime();
-                                // 时间比较
-                                boolean bolNotUn = false;
-                                // 时间比较
-                                if (goblinNftExCodeTask.getExStartTime().isBefore(exStartTime)) {
-                                    nftExCodeTask.setExStartTime(goblinNftExCodeTask.getExStartTime());
-                                    bolNotUn = true;
-                                }
-                                if (goblinNftExCodeTask.getExStopTime().isAfter(exStopTime)) {
-                                    nftExCodeTask.setExStopTime(goblinNftExCodeTask.getExStopTime());
-                                    bolNotUn = true;
-                                }
-
-                                if (bolNotUn) {
-                                    goblinNftExCodeTaskHashMap.put(goblinNftExCodeTask.getSkuId(), nftExCodeTask);
-                                }
-                            }
                         }
                     }
-
                     break;
 
                 default:
@@ -193,30 +167,11 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
                         // redis 存储
                         goblinRedisUtils.addCode(code, goblinNftExCodeVo, millisNum);
                     }
+            }
 
-                    GoblinNftExCodeTask nftExCodeTask = goblinNftExCodeTaskHashMap.get(goblinNftExCodeTask.getSkuId());
-                    if (nftExCodeTask == null) {
-                        goblinNftExCodeTaskHashMap.put(goblinNftExCodeTask.getSkuId(), goblinNftExCodeTask);
-                    } else {
-                        GoblinNftExCodeTask nftExCodeTaskCurrent = goblinNftExCodeTaskHashMap.get(goblinNftExCodeTask.getSkuId());
-                        LocalDateTime exStartTime = nftExCodeTaskCurrent.getExStartTime();
-                        LocalDateTime exStopTime = nftExCodeTaskCurrent.getExStopTime();
-
-                        boolean bolNotUn = false;
-                        // 时间比较
-                        if (goblinNftExCodeTask.getExStartTime().isBefore(exStartTime)) {
-                            nftExCodeTaskCurrent.setExStartTime(goblinNftExCodeTask.getExStartTime());
-                            bolNotUn = true;
-                        }
-                        if (goblinNftExCodeTask.getExStopTime().isAfter(exStopTime)) {
-                            nftExCodeTaskCurrent.setExStopTime(goblinNftExCodeTask.getExStopTime());
-                            bolNotUn = true;
-                        }
-
-                        if (bolNotUn) {
-                            goblinNftExCodeTaskHashMap.put(goblinNftExCodeTask.getSkuId(), nftExCodeTaskCurrent);
-                        }
-                    }
+            GoblinNftExCodeTask nftExCodeTask = goblinNftExCodeTaskHashMap.get(goblinNftExCodeTask.getSkuId());
+            if (nftExCodeTask == null) {
+                goblinNftExCodeTaskHashMap.put(goblinNftExCodeTask.getSkuId(), goblinNftExCodeTask);
             }
         }
 
@@ -249,7 +204,7 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
                     goblinNftExSku.setRdStopTime(exStopTime.toString());
                     bolTime = true;
                 }
-            }else {
+            } else {
                 bolTime = true;
                 goblinNftExSku.setExStartTime(exStartTime);
                 goblinNftExSku.setExStopTime(exStopTime);
@@ -258,7 +213,7 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
             }
 
 
-            if (bolTime){
+            if (bolTime) {
                 goblinRedisUtils.addSkuTime(key, goblinNftExSku);
             }
         }