删除new

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

@@ -6,6 +6,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
@@ -55,7 +56,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
 
         // 根据名称查询
         String title = goblinNftExActivityParam.getTitle();
-        GoblinNftExActivity goblinNftExActivityShow = goblinNftExActivityMapper.selectByTitle(title,goblinNftExActivityParam.getUid());
+        GoblinNftExActivity goblinNftExActivityShow = goblinNftExActivityMapper.selectByTitle(title, goblinNftExActivityParam.getUid());
         if (goblinNftExActivityShow != null) {
             return ResponseDto.failure("活动名称已存在!");
         }
@@ -166,10 +167,8 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         }
 
         StringBuffer skuIds = new StringBuffer();
-        Map<String, GoblinNftExSku> goblinNftExSkuMap = new HashMap<>();
         for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
             skuIds.append(goblinNftExSku.getSkuId()).append(",");
-            goblinNftExSkuMap.put(goblinNftExSku.getSkuId(), goblinNftExSku);
         }
 
 
@@ -179,36 +178,33 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         // 根据活动id获取code码
         List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectByActivityIds(activityId);
 
-
-        Map<String, List<GoblinNftExCode>> codeMap = new HashMap<>();
-        for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
-            if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId())) {
-                if (codeMap.get(goblinNftExCode.getBoxSkuId()) == null) {
-                    codeMap.put(goblinNftExCode.getBoxSkuId(), new ArrayList<>());
-                }
-                codeMap.get(goblinNftExCode.getBoxSkuId()).add(goblinNftExCode);
-            } else {
-                if (codeMap.get(goblinNftExCode.getSkuId()) == null) {
-                    codeMap.put(goblinNftExCode.getSkuId(), new ArrayList<>());
-                }
-                codeMap.get(goblinNftExCode.getSkuId()).add(goblinNftExCode);
-            }
-        }
-
-
         for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
 
             GoblinNftSkuVo goblinNftSkuVo = GoblinNftSkuVo.getNew().copy(goblinGoodsSku);
 
-            // 构建
-            GoblinNftExSku goblinNftExSku = goblinNftExSkuMap.get(goblinNftSkuVo.getSkuId());
-            GoblinNftExSkuVo goblinNftExSkuVo = GoblinNftExSkuVo.getNew().copy(goblinNftExSku);
+            GoblinNftExSku nftExSku = GoblinNftExSku.getNew();
+            for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
+                if (goblinGoodsSku.getSkuId().equals(goblinNftExSku)) {
+                    nftExSku = goblinNftExSku;
+                }
+                break;
+            }
+
+            GoblinNftExSkuVo goblinNftExSkuVo = GoblinNftExSkuVo.getNew().copy(nftExSku);
 
             Integer countNumber = 0;
             Integer useNumber = 0;
             Integer unUseNumber = 0;
+            ArrayList<GoblinNftExCode> gCodes = ObjectUtil.getGoblinNftExCodeArrayList();
+            for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
+                if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getBoxSkuId().equals(goblinGoodsSku.getSkuId())){
+                    gCodes.add(goblinNftExCode);
+                }
+                if (StringUtil.isBlank(goblinNftExCode.getBoxSkuId()) && goblinNftExCode.getSkuId().equals(goblinGoodsSku.getSkuId())){
+                    gCodes.add(goblinNftExCode);
+                }
+            }
 
-            List<GoblinNftExCode> gCodes = codeMap.get(goblinGoodsSku.getSkuId());
             if (gCodes == null) {
                 continue;
             }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java

@@ -7,6 +7,7 @@ import com.liquidnet.service.candy.entity.CandyCouponCode;
 import com.liquidnet.service.candy.entity.CandyUserCoupon;
 import com.liquidnet.service.goblin.dto.GoblinStoreMarketDto;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.entity.GoblinNftExCode;
 import com.liquidnet.service.goblin.entity.GoblinNftExCodeTask;
 import com.liquidnet.service.goblin.entity.GoblinNftExCodeTaskRelation;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
@@ -67,8 +68,8 @@ public class ObjectUtil {
     private static final ArrayList<CodeExcelVo> codeExcelVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftExCodeTaskRelation> goblinNftExCodeTaskRelationArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftExCodeTask> goblinNftExCodeTaskArrayList = new ArrayList<>();
-
     private static final ArrayList<GoblinStoreMarketDto> goblinStoreMarketDtoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinNftExCode> goblinNftExCodeArrayList = new ArrayList<>();
 
     public static ArrayList<SellDataOneVO> getSellDataOneVOArrayList() {
         return (ArrayList<SellDataOneVO>) sellDataOneVOArrayList.clone();
@@ -174,5 +175,9 @@ public class ObjectUtil {
         return (ArrayList<GoblinNftExCodeTask>) goblinNftExCodeTaskArrayList.clone();
     }
 
+    public static ArrayList<GoblinNftExCode> getGoblinNftExCodeArrayList(){
+        return (ArrayList<GoblinNftExCode>) goblinNftExCodeArrayList.clone();
+    }
+
 
 }