删除new

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

@@ -12,16 +12,30 @@ public class PageInfoVo {
     private int total;
     private Object list;
 
-    public PageInfoVo(){
+    public PageInfoVo() {
     }
 
-    public PageInfoVo(ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList, int count,int num) {
+/*
+    public PageInfoVo(ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList, int count, int num) {
         this.list = goblinNftExActivityArrayList;
-        this.total= count;
+        this.total = count;
     }
-    public PageInfoVo(ArrayList<GoblinNftExCodeVo> goblinNftExCodeVos,int count,String vio){
+
+    public PageInfoVo(ArrayList<GoblinNftExCodeVo> goblinNftExCodeVos, int count, String vio) {
         this.list = goblinNftExCodeVos;
-        this.total= count;
+        this.total = count;
+    }
+*/
+
+    private static final PageInfoVo obj = new PageInfoVo();
+
+    public static PageInfoVo getNew() {
+        try {
+            return (PageInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PageInfoVo();
+        }
     }
 
+
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -10,6 +10,8 @@ public class CollectionUtil {
     private static final HashMap<String, String> STRING_STRING_HASH_MAP = new HashMap<>();
     private static final HashMap<String, Object> STRING_OBJECT_HASH_MAP = new HashMap<>();
     private static final HashMap<String, Integer> STRING_INTEGER_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, BigDecimal> STRING_BIG_DECIMAL_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, Map<String, Object>> STRING_MAP_HASH_MAP = new HashMap<>();
     private static final LinkedList<String> STRING_LINKED_LIST = new LinkedList<>();
     private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
     private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
@@ -20,7 +22,6 @@ public class CollectionUtil {
     private static final ArrayList<BigDecimal> BIG_DECIMALS_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
 
-
     public static HashMap<String, String> mapStringString() {
         return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
     }
@@ -33,6 +34,14 @@ public class CollectionUtil {
         return (HashMap<String, Integer>) STRING_INTEGER_HASH_MAP.clone();
     }
 
+    public static HashMap<String, BigDecimal> mapStringBigDecimal() {
+        return (HashMap<String, BigDecimal>) STRING_BIG_DECIMAL_HASH_MAP.clone();
+    }
+
+    public static HashMap<String, Map<String, Object>> mapHashMap() {
+        return (HashMap<String, Map<String, Object>>) STRING_MAP_HASH_MAP.clone();
+    }
+
     public static LinkedList<String> linkedListString() {
         return (LinkedList<String>) STRING_LINKED_LIST.clone();
     }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -251,6 +251,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 if (size > 0) {// 说明有未设置抽奖概率的
                     avgHitRatio = new BigDecimal(100).subtract(sumHitRatio).divide(new BigDecimal(size), 2, RoundingMode.HALF_UP);
                 }
+
                 // 未设置概率的写入概率
                 ArrayList<GoblinGoodsSkuInfoVo> newSkuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
                 int skuListSize = skuInfoVos.size();
@@ -274,6 +275,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     }
                     newSkuInfoVos.add(infoVo);
                 }
+
+
                 if (CollectionUtil.isEmpty(newSkuInfoVos)) {
                     log.info("该盲盒概率超过100导致不能卖 skuIdList:{}", skuIdList);
                     return null;

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

@@ -78,7 +78,6 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
 
         PageHelper.startPage(goblinNftExActivityParam.getPageNum(), 20, true);
 
-
         /*
          * 获取分页nft兑换活动数据
          */
@@ -98,7 +97,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         }
 
 
-        ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList = ObjectUtil.getGoblinNftExActivityArrayList();
+        ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList = ObjectUtil.getGoblinNftExActivityVoArrayList();
         if (StringUtil.isNotBlank(activityIds)) {
             activityIds.deleteCharAt(activityIds.length() - 1);
 
@@ -141,8 +140,12 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
             }
         }
 
-        PageInfoVo pageInfo = new PageInfoVo(goblinNftExActivityArrayList, count, 0);
-        return pageInfo;
+
+        PageInfoVo pageInfoVo = PageInfoVo.getNew();
+        pageInfoVo.setList(goblinNftExActivityArrayList);
+        pageInfoVo.setTotal(count);
+        // PageInfoVo pageInfo = new PageInfoVo(goblinNftExActivityArrayList, count, 0);
+        return pageInfoVo;
     }
 
     @Override
@@ -250,6 +253,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
 
         ArrayList<ActivityExcelVo> activityExcelVoArrayList = ObjectUtil.getActivityExcelVoArrayList();
         if (StringUtil.isNotBlank(activityIds)) {
+
             activityIds.deleteCharAt(activityIds.length() - 1);
 
             long k = System.currentTimeMillis();

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

@@ -85,7 +85,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             String skuName = goblinNftExCodeParam.getSkuName();
             List<GoblinGoodsSku> goblinGoodsSkus = goblinGoodsSkuMapper.selectSkuLikeName(skuName);
             if (goblinGoodsSkus.size() <= 0) {
-                return new PageInfoVo();
+                return PageInfoVo.getNew();
             }
             StringBuffer skuIds = new StringBuffer();
             for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
@@ -112,7 +112,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         }
 
         // 获取返回对象实例
-        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();
+        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeVoArrayList();
 
         if (StringUtil.isNotBlank(skuIds)) {
             // 批量查询
@@ -138,19 +138,11 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         // 根据活动ids 获取兑换活动和sku的关联
         List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectGoblinNftExSkuByActivityIds(acticityIds.toString());
 
-        Map<String, List<GoblinNftExSku>> map = new HashMap<>();
-        for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
-            if (map.get(goblinNftExSku.getActivityId()) == null) {
-                map.put(goblinNftExSku.getActivityId(), new ArrayList<>());
-            }
-            map.get(goblinNftExSku.getActivityId()).add(goblinNftExSku);
-        }
-
 
         LocalDateTime now = LocalDateTime.now();
         for (GoblinNftExCodeVo gnc : goblinNftExCodeArrayList) {
-            List<GoblinNftExSku> goblinNftExSkuList = map.get(gnc.getActivityId());
-            for (GoblinNftExSku goblinNftExSku : goblinNftExSkuList) {
+            for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
+                if (gnc.getActivityId().equals(goblinNftExSku.getActivityId())) {
                     if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                         gnc.setExStartTime(goblinNftExSku.getExStartTime());
                         gnc.setExStopTime(goblinNftExSku.getExStopTime());
@@ -170,55 +162,31 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     }
                 }
             }
+        }
 
-        PageInfoVo pageInfo = new PageInfoVo(goblinNftExCodeArrayList, count, "");
-
-        return pageInfo;
+        PageInfoVo pageInfoVo = PageInfoVo.getNew();
+        pageInfoVo.setList(goblinNftExCodeArrayList);
+        pageInfoVo.setTotal(count);
+        return pageInfoVo;
     }
 
     @Override
+    @Transactional
     public Boolean defDrivLoseCode(String codeIds) {
-
         // 获取兑换码
         List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectByIds(codeIds);
-
-        List<String> codes = new ArrayList<>();
-        Map<String, Integer> skuMap = new HashMap<>();
-
         for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
             // redis 主动失效
-            codes.add(goblinNftExCode.getCode());
             goblinNftExCode.setState(3);
             goblinNftExCode.setUpdatedAt(LocalDateTime.now());
-
-            String skuId = "";
-            if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId())) {
-                skuId = goblinNftExCode.getBoxSkuId();
-            } else {
-                skuId = goblinNftExCode.getSkuId();
-            }
-
-            if (StringUtil.isNotBlank(skuId)) {
-                if (skuMap.get(skuId) == null) {
-                    skuMap.put(skuId, 0);
-                }
-
-                Integer number = skuMap.get(skuId);
-                skuMap.put(skuId, number + 1);
-            }
             goblinRedisUtils.removeCode(goblinNftExCode.getCode());
         }
-
-/*        if (skuMap.size() > 0) {
-            for (String key : skuMap.keySet()) {
-                // goblinRedisUtils.incrSkuStock(null, key, skuMap.get(key));
-            }
-        }*/
         // 批量修改
         goblinNftExCodeMapper.updateCodes(goblinNftExCodes);
         return true;
     }
 
+
     @Override
     @Transactional
     public ResponseDto<Boolean> addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam) {
@@ -313,8 +281,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         }
 
         // 获取返回对象实例
-        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();
-
+        ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeVoArrayList();
 
         if (StringUtil.isNotBlank(skuIds)) {
             // 批量查询
@@ -344,20 +311,11 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         // 根据活动ids 获取兑换活动和sku的关联
         List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectGoblinNftExSkuByActivityIds(acticityIds.toString());
 
-        Map<String, List<GoblinNftExSku>> map = new HashMap<>();
-        for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
-            if (map.get(goblinNftExSku.getActivityId()) == null) {
-                map.put(goblinNftExSku.getActivityId(), new ArrayList<>());
-            }
-            map.get(goblinNftExSku.getActivityId()).add(goblinNftExSku);
-        }
-
-
         ArrayList<CodeExcelVo> codeExcelVoArrayList = ObjectUtil.getCodeExcelVoArrayList();
         for (GoblinNftExCodeVo gnc : goblinNftExCodeArrayList) {
-            List<GoblinNftExSku> goblinNftExSkuList = map.get(gnc.getActivityId());
-            for (GoblinNftExSku goblinNftExSku : goblinNftExSkuList) {
 
+            for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
+                if (gnc.getActivityId().equals(goblinNftExSku.getActivityId())) {
                     if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                         gnc.setExStartTime(goblinNftExSku.getExStartTime());
                         gnc.setExStopTime(goblinNftExSku.getExStopTime());
@@ -370,9 +328,10 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                         }
                     }
                 }
+            }
 
 
-            CodeExcelVo codeExcelVo = new CodeExcelVo();
+            CodeExcelVo codeExcelVo = CodeExcelVo.getNew();
             codeExcelVo.setCode(gnc.getCode());
             String val = "";
             switch (gnc.getState()) {

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

@@ -77,6 +77,7 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
         List<GoblinNftExSku> goblinNftExSkus = new ArrayList<>();
 
         StringBuffer updTaskIds = new StringBuffer();
+
         for (GoblinNftExCodeTask goblinNftExCodeTask : goblinNftExCodeTasks) {
 
             GoblinNftExSku goblinNftExSku = new GoblinNftExSku();
@@ -92,7 +93,6 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
             goblinNftExSku.setCreatedAt(now);
             goblinNftExSkus.add(goblinNftExSku);
 
-
             updTaskIds.append(goblinNftExCodeTask.getTaskId()).append(",");
 
             switch (goblinNftExCodeTask.getUnbox()) {

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

@@ -7,6 +7,8 @@ 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.GoblinNftExCodeTask;
+import com.liquidnet.service.goblin.entity.GoblinNftExCodeTaskRelation;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.liquidnet.service.goblin.dto.vo.ActivityExcelVo;
@@ -60,10 +62,11 @@ public class ObjectUtil {
     private static final ArrayList<SellDataOneVO> sellDataOneVOArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftExActivityVo> goblinNftExActivityVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftExCodeVo> goblinNftExCodeVoArrayList = new ArrayList<>();
-    private static final ArrayList<GoblinNftExSkuVo> goblinNftExSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftSkuVo> goblinNftSkuVoArrayList = new ArrayList<>();
-    private static final ArrayList<ActivityExcelVo> activityExcelVoArrayList = new ArrayList();
-    private static final ArrayList<CodeExcelVo> codeExcelVoArrayList = new ArrayList();
+    private static final ArrayList<ActivityExcelVo> activityExcelVoArrayList = new ArrayList<>();
+    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<>();
 
@@ -143,18 +146,14 @@ public class ObjectUtil {
         return (ArrayList<KylinApiCameraDevicesVo>) kylinApiCameraDevicesVoArrayList.clone();
     }
 
-    public static ArrayList<GoblinNftExActivityVo> getGoblinNftExActivityArrayList() {
+    public static ArrayList<GoblinNftExActivityVo> getGoblinNftExActivityVoArrayList() {
         return (ArrayList<GoblinNftExActivityVo>) goblinNftExActivityVoArrayList.clone();
     }
 
-    public static ArrayList<GoblinNftExCodeVo> getGoblinNftExCodeArrayList() {
+    public static ArrayList<GoblinNftExCodeVo> getGoblinNftExCodeVoArrayList() {
         return (ArrayList<GoblinNftExCodeVo>) goblinNftExCodeVoArrayList.clone();
     }
 
-    public static ArrayList<GoblinNftExSkuVo> getGoblinNftExSkuArrayList() {
-        return (ArrayList<GoblinNftExSkuVo>) goblinNftExSkuVoArrayList.clone();
-    }
-
     public static ArrayList<GoblinNftSkuVo> getGoblinNftSkuVoArrayList() {
         return (ArrayList<GoblinNftSkuVo>) goblinNftSkuVoArrayList.clone();
     }
@@ -163,8 +162,16 @@ public class ObjectUtil {
         return (ArrayList<ActivityExcelVo>) activityExcelVoArrayList.clone();
     }
 
-    public static ArrayList<CodeExcelVo> getCodeExcelVoArrayList(){
-        return (ArrayList<CodeExcelVo>)codeExcelVoArrayList.clone();
+    public static ArrayList<CodeExcelVo> getCodeExcelVoArrayList() {
+        return (ArrayList<CodeExcelVo>) codeExcelVoArrayList.clone();
+    }
+
+    public static ArrayList<GoblinNftExCodeTaskRelation> getGoblinNftExCodeTaskRelationArrayList() {
+        return (ArrayList<GoblinNftExCodeTaskRelation>) goblinNftExCodeTaskRelationArrayList.clone();
+    }
+
+    public static ArrayList<GoblinNftExCodeTask> getGoblinNftExCodeTaskArrayList() {
+        return (ArrayList<GoblinNftExCodeTask>) goblinNftExCodeTaskArrayList.clone();
     }