erp 组合购提交

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

 package com.liquidnet.service.platform.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -38,7 +40,6 @@ public class GoblinRedisUtils {
     public void del(String... keys) {
         getRedis().del(keys);
     }
-
     public boolean set(String key, Object val) {
         return getRedis().set(key, val);
     }
@@ -54,17 +55,6 @@ public class GoblinRedisUtils {
         }
     }
 
-    // 获取 nft订单详情vo
-    public GoblinNftOrderVo getNftOrder(String orderId) {
-        String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO.concat(orderId);
-        Object obj = getRedis().get(redisKey);
-        if (obj == null) {
-            return null;
-        } else {
-            return (GoblinNftOrderVo) obj;
-        }
-    }
-
     // 获取 订单相关Skuvo
     public GoblinOrderSkuVo getGoblinOrderSkuVo(String orderSkuId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_SKU.concat(orderSkuId);
@@ -75,7 +65,6 @@ public class GoblinRedisUtils {
             return (GoblinOrderSkuVo) obj;
         }
     }
-
     //获取 spu销量
     public Integer getSpuSaleCount(String spuId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_SALE_SPU_COUNT.concat(spuId);
@@ -132,7 +121,7 @@ public class GoblinRedisUtils {
 
 
     // 减少库存
-    public int decrSkuStock(String marketPre, String skuId, Integer stock) {
+    public int decrSkuStock(String marketPre, String skuId, Integer stock){
         String rk = GoblinRedisConst.REAL_STOCK_SKU;
         if (marketPre != null && !marketPre.equals("null")) {
             rk = rk.concat(marketPre + ":");
@@ -213,7 +202,6 @@ public class GoblinRedisUtils {
 
     /**
      * 添加code码  添加过期时间
-     *
      * @param code
      * @param goblinNftExCodeVo
      * @param millisNum
@@ -221,7 +209,7 @@ public class GoblinRedisUtils {
      */
     public boolean addCode(String code, GoblinNftExCodeVo goblinNftExCodeVo, long millisNum) {
         String key = GoblinRedisConst.ACTIVITY_SKU_CODE.concat(code);
-        return getRedis().set(key, goblinNftExCodeVo, millisNum);
+        return getRedis().set(key,goblinNftExCodeVo,millisNum);
     }
 
     /**
@@ -247,7 +235,7 @@ public class GoblinRedisUtils {
         ) {// 可以返回库存
 
             String rk = GoblinRedisConst.REAL_STOCK_SKU.concat(info.getSkuId());
-            return (int) getRedis().get(rk);
+            return (int)getRedis().get(rk);
         } else {// 不计入库存
             return 0;
         }
@@ -255,7 +243,6 @@ public class GoblinRedisUtils {
 
     /**
      * redis codes主动失效
-     *
      * @param code
      */
     public void removeCode(String code) {
@@ -265,34 +252,31 @@ public class GoblinRedisUtils {
 
     /**
      * 获取sku时间
-     *
      * @param skuId
      * @return
      */
     public GoblinNftExSkuVo getSkuTime(String skuId) {
         String key = GoblinRedisConst.ACTIVITY_SKU_TIME.concat(skuId);
         Object val = getRedis().get(key);
-        if (!StringUtil.isEmpty(val)) {
-            return (GoblinNftExSkuVo) val;
+        if (!StringUtil.isEmpty(val)){
+            return (GoblinNftExSkuVo)val;
         }
         return null;
     }
 
     /**
      * sku时间赋值
-     *
      * @param skuId
      * @param obj
      * @return
      */
-    public boolean addSkuTime(String skuId, GoblinNftExSkuVo goblinNftExSkuVo) {
+    public boolean addSkuTime(String skuId,GoblinNftExSkuVo goblinNftExSkuVo) {
         String key = GoblinRedisConst.ACTIVITY_SKU_TIME.concat(skuId);
-        return getRedis().set(key, goblinNftExSkuVo);
+        return getRedis().set(key,goblinNftExSkuVo);
     }
 
     /**
      * 获取sku库存
-     *
      * @param skuId
      * @return
      */
@@ -318,87 +302,8 @@ public class GoblinRedisUtils {
     }
 
 
-    /**
-     * 商品基础信息
-     *
-     * @param spuId 商品ID
-     * @return GoblinGoodsInfoVo
-     */
-    public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
-        String pre = GoblinStatusConst.MarketPreStatus.getPre(spuId);
-        if (pre != null && pre.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
-            String[] spuSplitArr = spuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue());
-            String rk = GoblinRedisConst.BASIC_GOODS.concat(spuSplitArr[0]);
-            GoblinGoodsInfoVo vo = (GoblinGoodsInfoVo) getRedis().get(rk);
-            if (vo == null) {
-                return vo;
-            }
-            String marketrk = GoblinRedisConst.BASIC_GOODS.concat(spuId);
-            GoblinGoodsInfoVo marketVo = (GoblinGoodsInfoVo) getRedis().get(marketrk);
-            if (marketVo == null) {
-                return marketVo;
-            }
-            vo.setSpuId(marketVo.getSpuId());
-            List<String> skuIdList = CollectionUtil.linkedListString();
-            for (String skuIds : vo.getSkuIdList()) {
-                skuIdList.add(skuIds.concat(pre).concat(spuSplitArr[1]));
-            }
-            vo.setSkuIdList(skuIdList);
-            vo.setPriceGe(marketVo.getPriceGe());
-            vo.setPriceLe(marketVo.getPriceLe());
-            vo.setMarketId(marketVo.getMarketId());
-            vo.setDelFlg(marketVo.getDelFlg().equals("1") ? marketVo.getDelFlg() : vo.getDelFlg());
-            return vo;
-        } else {
-            String rk = GoblinRedisConst.BASIC_GOODS.concat(spuId);
-            GoblinGoodsInfoVo vo = (GoblinGoodsInfoVo) getRedis().get(rk);
-            if (null == vo) {
-                getRedis().set(rk, vo);
-            }
-            return vo;
-        }
-    }
 
-    /**
-     * 单品信息
-     *
-     * @param skuId 单品ID
-     * @return GoblinGoodsSkuInfoVo
-     */
-    public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
-        String pre = GoblinStatusConst.MarketPreStatus.getPre(skuId);
-        if (pre != null && pre.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
-
-            String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())[0]);
-            GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) getRedis().get(rk);
-            if (vo == null) {
-                return vo;
-            }
-            String marketrk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
-            GoblinGoodsSkuInfoVo marketVo = (GoblinGoodsSkuInfoVo) getRedis().get(marketrk);
-            if (marketVo == null) {
-                return marketVo;
-            }
 
-            vo.setSpuId(marketVo.getSpuId());
-            vo.setSkuId(marketVo.getSkuId());
-            vo.setPrice(marketVo.getPrice());
-            vo.setPriceMember(marketVo.getPriceMember());
-            vo.setSkuStock(marketVo.getSkuStock());
-            vo.setBuyLimit(marketVo.getBuyLimit());
-            vo.setBuyRoster(marketVo.getBuyRoster());
-            vo.setBuyFactor(marketVo.getBuyFactor());
-//            vo.setDelFlg("0");
-            vo.setDelFlg(marketVo.getDelFlg().equals("1") ? marketVo.getDelFlg() : vo.getDelFlg());
-            vo.setMarketId(marketVo.getMarketId());
-            vo.setCreatedAt(LocalDateTime.now());
-            return vo;
-        } else {
-            String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
-            GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) getRedis().get(rk);
-            return vo;
-        }
-    }
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */

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

@@ -68,7 +68,6 @@ public class ObjectUtil {
     private static final ArrayList<GoblinNftExCodeTask> goblinNftExCodeTaskArrayList = new ArrayList<>();
     private static final ArrayList<GoblinStoreMarketDto> goblinStoreMarketDtoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinNftExCode> goblinNftExCodeArrayList = new ArrayList<>();
-    private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVo = new ArrayList<>();
     private static final ArrayList<GoblinNftTransferOrder> goblinNftTransferOrders = new ArrayList<>();
     private static final ArrayList<GoblinUserDigitalArtwork> goblinUserDigitalArtworks = new ArrayList<>();
 
@@ -76,10 +75,6 @@ public class ObjectUtil {
         return (ArrayList<SellDataOneVO>) sellDataOneVOArrayList.clone();
     }
 
-    public static ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVo() {
-        return (ArrayList<GoblinGoodsSkuInfoVo>) goblinGoodsSkuInfoVo.clone();
-    }
-
     public static ArrayList<AdamTagParentVo> getAdamTagParentVoArrayList() {
         return (ArrayList<AdamTagParentVo>) adamTagParentVoArrayList.clone();
     }