Merge branch 'dev_notice_0708' into dev_bd_rm_consumer_od

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

@@ -539,21 +539,13 @@ public class DataUtils {
     private List<GoblinMixDetailsVo> getGoblinMixDetailsVos(List<String> toDayCombinationIds) {
         List<GoblinMixDetailsVo> toDayCombinationList = ObjectUtil.getGoblinMixDetailsVoList();
         //redis key
-        String rdk = GoblinRedisConst.GOBLIN_MIX_DETAILS;
-        String rk = GoblinRedisConst.BASIC_GOODS_SKU;
         if (toDayCombinationIds != null && toDayCombinationIds.size() > 0) {
             //查询redis
             toDayCombinationIds.forEach(id -> {
-                Object obj = redisUtil.get(rdk.concat(id));
-                if (obj != null) {
-                    GoblinMixDetailsVo goblinMixDetailsVo = (GoblinMixDetailsVo) obj;
-                    goblinMixDetailsVo.getItem().forEach(goblinMixDetailsItemVo -> {
-                        Object objRk = redisUtil.get(rk.concat(goblinMixDetailsItemVo.getSkuId()));
-                        if (objRk != null) {
-                            goblinMixDetailsItemVo.setSkuName(((GoblinGoodsSkuInfoVo) objRk).getName());
-                        }
-                    });
-                    toDayCombinationList.add(goblinMixDetailsVo);
+                GoblinMixDetailsVo mixDetails = goblinRedisUtils.getMixDetails(id);
+                for (GoblinMixDetailsItemVo item : mixDetails.getItem()) {
+                    GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(item.getSkuId());
+                    item.setSkuName(skuInfoVo.getName());
                 }
             });
 
@@ -678,6 +670,8 @@ public class DataUtils {
             Query queryToDayNft = new Query();
             queryToDayNft.addCriteria(Criteria.where("skuType").is(1));
             queryToDayNft.addCriteria(Criteria.where("delFlg").is("0"));
+            queryToDayNft.addCriteria(Criteria.where("soldoutStatus").is("0"));
+            queryToDayNft.addCriteria(Criteria.where("skuAppear").is("0"));
             queryToDayNft.addCriteria(Criteria.where("saleStartTime").gte(nowTimeTime).lt(toDayEndTime));
 //        queryToDayNft.addCriteria(Criteria.where("skuId").nin(toDayAboutNftSkuIds));
             /* queryToDayNft.addCriteria(Criteria.where("skuId").nin(allListSkuIds));*/
@@ -693,6 +687,8 @@ public class DataUtils {
             Query queryThreeNft = new Query();
             queryThreeNft.addCriteria(Criteria.where("skuType").is(1));
             queryThreeNft.addCriteria(Criteria.where("delFlg").is("0"));
+            queryThreeNft.addCriteria(Criteria.where("soldoutStatus").is("0"));
+            queryThreeNft.addCriteria(Criteria.where("skuAppear").is("0"));
             queryThreeNft.addCriteria(Criteria.where("saleStartTime").gte(toDayEndTime).lt(threeEndTime));
             /*queryThreeNft.addCriteria(Criteria.where("skuId").nin(allListSkuIds));*/
             queryThreeNft.addCriteria(Criteria.where("shelvesHandle").ne("3"));

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 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 org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Component;
@@ -265,4 +266,16 @@ public class GoblinRedisUtils {
             return vo;
         }
     }
+
+    // 获取 组合售数据
+    public GoblinMixDetailsVo getMixDetails(String mixId) {
+        String rdk = GoblinRedisConst.GOBLIN_MIX_DETAILS.concat(mixId);
+        Object obj = redisUtil.get(rdk);
+        if (obj == null) {
+            return GoblinMixDetailsVo.getNew();
+        } else {
+            return (GoblinMixDetailsVo) obj;
+        }
+    }
+
 }