修改 kylin

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRecommendActiveServiceImpl.java

@@ -217,29 +217,29 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
         GoblinMixDetailsVo baseVo = kylinRedisUtils.getMixDetails(mixId);
         //GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
         GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, "");
-        /*int stock = 0;
+        int stock = 0;
         for (GoblinMixDetailsItemVo item : vo.getItem()) {
-            GoblinGoodsSkuInfoVo skuInfoVo = redisUtils.getGoodsSkuInfoVo(item.getSkuId());
-            GoblinGoodsInfoVo spuInfoVo = redisUtils.getGoodsInfoVo(skuInfoVo.getSpuId());
+            GoblinGoodsSkuInfoVo skuInfoVo = kylinRedisUtils.getGoodsSkuInfoVo(item.getSkuId());
+            GoblinGoodsInfoVo spuInfoVo = kylinRedisUtils.getGoodsInfoVo(skuInfoVo.getSpuId());
             item.setSkuPic(skuInfoVo.getSkuPic());
             item.setStock(0);
             item.setSkuName(skuInfoVo.getName());
             item.setSpuName(spuInfoVo.getName());
             if (skuInfoVo.getUnbox().equals("1")) {
-                List<String> relationIds = redisUtils.getGoblinMixRelationBox(item.getSkuId(), vo.getMixId());
+                List<String> relationIds = kylinRedisUtils.getGoblinMixRelationBox(item.getSkuId(), vo.getMixId());
                 for (String skuId : relationIds) {
-                    stock += redisUtils.getSkuStock(vo.getMixId(), skuId);
+                    stock += kylinRedisUtils.getSkuStock(vo.getMixId(), skuId);
                 }
             } else {
-                stock += redisUtils.getSkuStock(vo.getMixId(), item.getSkuId());
+                stock += kylinRedisUtils.getSkuStock(vo.getMixId(), item.getSkuId());
             }
         }
         if (stock == 0) {
             vo.setStatus(8);
         } else {
             LocalDateTime nt = LocalDateTime.now();
-            LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DTF_YMD_HMS);
-            LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DTF_YMD_HMS);
+            LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DateUtil.DTF_YMD_HMS);
+            LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DateUtil.DTF_YMD_HMS);
             if (nt.isBefore(st)) {
                 vo.setStatus(9);
             } else if (nt.isAfter(et)) {
@@ -247,7 +247,7 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
             } else {
                 vo.setStatus(6);
             }
-        }*/
+        }
         return vo;
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/KylinRedisUtils.java

@@ -5,15 +5,13 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinListCollectVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMixDetailsVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -278,4 +276,39 @@ public class KylinRedisUtils {
             return (GoblinMixDetailsVo) obj;
         }
     }
+    //根据用户uid和混合mixId查询用户预约
+    public GoblinMixReserveVo getReserveMixByUid(String uid, String mixId) {
+        Object obj = redisUtil.get(GoblinRedisConst.GOBLIN_MIX_RESERVE_UID.concat(mixId).concat(":").concat(uid));
+        if (obj == null) {
+            return null;
+        } else {
+            return (GoblinMixReserveVo) obj;
+        }
+    }
+    /**
+     * 获取 盲盒skuId 关联 的skuId
+     */
+    public ArrayList<String> getGoblinMixRelationBox(String skuId, String mixId) {
+        String rdk = GoblinRedisConst.GOBLIN_MIX_RELATION_BOX.concat(skuId).concat(":" + mixId);
+        Object obj = redisUtil.get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (ArrayList<String>) obj;
+        }
+    }
+    public int getSkuStock(String marketPre, String skuId) {
+        String rk = GoblinRedisConst.REAL_STOCK_SKU;
+        if (marketPre != null && !marketPre.equals("null")) {
+            rk = rk.concat(marketPre + ":");
+        }
+        rk = rk.concat(skuId);
+        Object obj = redisUtil.get(rk);
+        if (obj == null) {
+            return 0;
+        } else {
+            return (int) obj;
+        }
+    }
+
 }