删除new

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

@@ -184,10 +184,10 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
 
             GoblinNftExSku nftExSku = GoblinNftExSku.getNew();
             for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
-                if (goblinGoodsSku.getSkuId().equals(goblinNftExSku)) {
+                if (goblinGoodsSku.getSkuId().equals(goblinNftExSku.getSkuId())) {
                     nftExSku = goblinNftExSku;
+                    break;
                 }
-                break;
             }
 
             GoblinNftExSkuVo goblinNftExSkuVo = GoblinNftExSkuVo.getNew().copy(nftExSku);
@@ -197,15 +197,19 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
             Integer unUseNumber = 0;
             ArrayList<GoblinNftExCode> gCodes = ObjectUtil.getGoblinNftExCodeArrayList();
             for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
-                if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getBoxSkuId().equals(goblinGoodsSku.getSkuId())){
+                /* if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getBoxSkuId().equals(goblinGoodsSku.getSkuId())) {
                     gCodes.add(goblinNftExCode);
                 }
-                if (StringUtil.isBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())){
+                if (StringUtil.isBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())) {
+                    gCodes.add(goblinNftExCode);
+                }*/
+
+                if (goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())){
                     gCodes.add(goblinNftExCode);
                 }
             }
 
-            if (gCodes == null) {
+            if (gCodes == null || gCodes.size() <= 0) {
                 continue;
             }
             for (GoblinNftExCode goblinNftExCode : gCodes) {

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

@@ -103,10 +103,10 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         StringBuffer skuIds = new StringBuffer();
         StringBuffer acticityIds = new StringBuffer();
         for (GoblinNftExCode gnc : goblinNftExCodes) {
-            if (StringUtil.isNotBlank(gnc.getSkuId())) {
-                skuIds.append(gnc.getSkuId()).append(",");
-            } else {
+            if (StringUtil.isNotBlank(gnc.getBoxSkuId())) {
                 skuIds.append(gnc.getBoxSkuId()).append(",");
+            } else {
+                skuIds.append(gnc.getSkuId()).append(",");
             }
             acticityIds.append(gnc.getActivityId()).append(",");
         }