秒杀

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontController.java

@@ -94,6 +94,7 @@ public class GoblinFrontController {
     @GetMapping("getSeckilll")
     @ApiOperation("获得秒杀首页要用的")
     public ResponseDto getSeckilll() throws ParseException {
+        //获得秒杀列表绑定
         List<GoblinFrontSeckill> list= (List<GoblinFrontSeckill>) redisUtil.get(GoblinRedisConst.FRONT_SECKILL);
         GoblinFrontSeckillVo goblinFrontSeckillVo=GoblinFrontSeckillVo.getNew();
         ArrayList<GoblinGoodsInfoVo> goblinGoodsInfoVoArrayList=ObjectUtil.goblinGoodsInfoVoArrayList();
@@ -130,7 +131,7 @@ public class GoblinFrontController {
                             goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
                         }
                     }else if(type.equals("s")){
-                        //商铺的vo
+                        //商铺活动的vo
                         GoblinStoreMarketVo goblinStoreMarketVo=goblinRedisUtils.getGoblinStoreMarketVo(idM);
                         if(goblinStoreMarketVo==null){
                             break;
@@ -146,7 +147,14 @@ public class GoblinFrontController {
                         }
                         if(isGet){
                             //获取商铺 对应关系
-
+                            List<GoblinMarketRelationVo>  list1=goblinRedisUtils.getMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue(),goblinStoreMarketVo.getStoreMarketId());
+                            //获得商品
+                            //遍历 活动表
+                            for(GoblinMarketRelationVo goblinMarketRelationVo:list1){
+                                //找到对应的spu商品
+                                GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinMarketRelationVo.getSpuId());
+                                goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
+                            }
                         }
 
                     }
@@ -156,7 +164,7 @@ public class GoblinFrontController {
 
 
         }
-        return ResponseDto.success( list );
+        return ResponseDto.success( goblinFrontSeckillVo);
     }
 
     public  boolean belongCalendar( String startString, String  endString) throws ParseException {