订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -17,14 +17,17 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.dataoke.DingDongTime;

import com.yeshi.fanli.dto.jd.JDSearchResult;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TLJBuyGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

@@ -42,14 +45,15 @@
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -63,6 +67,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.OtherInfo;

import com.yeshi.fanli.vo.goods.SpikeTimeVO;

import com.yeshi.fanli.vo.homemodule.BannerVO;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.search.SearchKeyTOPVO;

import com.yeshi.fanli.vo.search.SearchKeyVO;

@@ -76,7 +81,7 @@
public class RecommendControllerV2 {



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private QualityGoodsService qualityGoodsService;

@@ -95,9 +100,6 @@


   @Resource

   private QualityFlashSaleService qualityFlashSaleService;



   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;

@@ -128,11 +130,12 @@


   @Resource

   private DaTaoKeGoodsService daTaoKeGoodsService;

	


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

   

	
   @Resource

   private HongBaoManageService hongBaoManageService;



   /**

    * 新版推荐专题管理(1.5.3)

@@ -150,31 +153,34 @@
         JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



         // 2、顶部轮播图

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");

         List<SwiperPicture> topPicList = new ArrayList<>();

         List<BannerVO> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top",

               acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



         List<BannerVO> topPicList = new ArrayList<>();

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);



         root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));



         // 3、邀请有奖

         List<SwiperPicture> invitePicList = null;

         List<BannerVO> invitePicList = null;

         if ("ios".equalsIgnoreCase(acceptData.getPlatform())

               && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            // 如果IOS当前版本处于审核状态就不返回

         } else {

            invitePicList = swiperPictureService.getByBannerCard("index_invite");

            invitePicList = swiperPictureService.getByBannerCardAndVersion("index_invite", acceptData.getPlatform(),

                  Integer.parseInt(acceptData.getVersion()));

         }



         if (invitePicList == null) {

            invitePicList = new ArrayList<SwiperPicture>();

            invitePicList = new ArrayList<BannerVO>();

         }

         root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));



         // 4、IOS的底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

            root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));

         }



         root.put("spikeGoods", getSpikeGoodsContent(acceptData));

@@ -209,32 +215,35 @@


   private JSONObject getSpikeGoodsContent(AcceptData acceptData) {

      long nowTime = System.currentTimeMillis();

      Calendar calendar=   Calendar.getInstance(); 
      Calendar calendar = Calendar.getInstance();

      calendar.setTimeInMillis(nowTime);

      List<String> dtoList = DaTaoKeUtil.getDingDongQiangTime(calendar);	
      List<DingDongTime> dtoList = DaTaoKeUtil.getDingDongQiangTime(calendar);

      int dateNum = Integer.parseInt(TimeUtil.getGernalTime(nowTime, "ddHH"));

      String timeStr = null;

      int nextPos = 0;

      for (int i = 0; i < dtoList.size() - 1; i++) {

         if (dateNum >= Integer.parseInt(dtoList.get(i)) && dateNum < Integer.parseInt(dtoList.get(i + 1))) {

            timeStr = dtoList.get(i);

         if (dateNum >= Integer.parseInt(dtoList.get(i).getTime())

               && dateNum < Integer.parseInt(dtoList.get(i + 1).getTime())) {

            timeStr = dtoList.get(i).getTime();

            nextPos = i + 1;

            break;

         }

      }

		


      if (timeStr == null)

         timeStr = dtoList.get(dtoList.size() - 1);

         timeStr = dtoList.get(dtoList.size() - 1).getTime();



      long nextTime = nowTime + 1000 * 60 * 60L;// 默认为1小时

      if (nextPos < dtoList.size()) {

         nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos),

               "yyyyMMddHH");

         nextTime = TimeUtil.convertToTimeTemp(

               TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos).getTime(), "yyyyMMddHH");

      }



      JSONArray array = null;

      String timekey = String.format("spikeGoods_hour_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      String cachekey = String.format("spikeGoodsList_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      String timekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsHourNew,acceptData.getPlatform() +"-"+acceptData.getVersion());

      String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsListNew,acceptData.getPlatform() +"-"+acceptData.getVersion());



		
      Calendar nowCalendar = Calendar.getInstance();

      nowCalendar.setTimeInMillis(nowTime);

      int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);

@@ -250,19 +259,14 @@
      }



      JumpDetailV2 jumpDetail = null;

      if(VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {

      if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {

         jumpDetail = jumpDetailV2Service.getByTypeCache("spike_goods_list");

      } else {

         jumpDetail = jumpDetailV2Service.getByTypeCache("web");

      }

		
		


      if (array == null) {

         array = new JSONArray();



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();



         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



@@ -277,15 +281,18 @@


         /* 遍历列表数据 */



         ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());



         for (DaTaoKeDetailV2 detail : listGoods) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);

            if (taoBaoGoodsBrief == null) {

               continue;

            }

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE));

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, configParamsDTO);



            JSONObject params = new JSONObject();

            params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());

            params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());



            JSONObject goods = new JSONObject();

            goods.put("goods", gson.toJson(detailVO));

@@ -320,7 +327,7 @@
            }

         root.put("imgList", imgArray);

         JSONObject params = new JSONObject();

         params.put("url", configService.get("spike_goods_link"));

         params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));

         root.put("params", params);

         root.put("jumpDetail", jumpDetail);

         root.put("name", "限时秒杀");

@@ -330,7 +337,7 @@
         root.put("endTime", endTime > 0 ? endTime : 0);

         root.put("listgoods", array);

         JSONObject params = new JSONObject();

         params.put("url", configService.get("spike_goods_link"));

         params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));

         root.put("params", params);

         root.put("jumpDetail", jumpDetail);

      }

@@ -342,10 +349,9 @@
      return root;

   }



	
	
   /**

    * 限时秒杀列表

    * 
    * @param acceptData

    * @param page

    * @param auctionId

@@ -354,76 +360,30 @@
    */

   @RequestMapping("getSpikTime")

   public void getSpikTime(AcceptData acceptData, PrintWriter out) {

      List<DingDongTime> timeList = DaTaoKeUtil.getDingDongQiangTime(Calendar.getInstance());

      List<SpikeTimeVO> list = new ArrayList<SpikeTimeVO>();

		
      SpikeTimeVO spikeTime0 = new SpikeTimeVO();

      spikeTime0.setTime("00:00");

      spikeTime0.setState("进行中");

      spikeTime0.setRequestTime("2400");

		
      SpikeTimeVO spikeTime1 = new SpikeTimeVO();

      spikeTime1.setTime("08:00");

      spikeTime1.setState("进行中");

      spikeTime1.setRequestTime("2408");

		
      SpikeTimeVO spikeTime2 = new SpikeTimeVO();

      spikeTime2.setTime("10:00");

      spikeTime2.setState("进行中");

      spikeTime2.setChecked(true);

      spikeTime2.setRequestTime("2410");

		
      SpikeTimeVO spikeTime3 = new SpikeTimeVO();

      spikeTime3.setTime("13:00");

      spikeTime3.setState("即将开始");

      spikeTime3.setRequestTime("2413");

		
      SpikeTimeVO spikeTime4 = new SpikeTimeVO();

      spikeTime4.setTime("15:00");

      spikeTime4.setState("即将开始");

      spikeTime4.setRequestTime("2415");

		
		
      SpikeTimeVO spikeTime5 = new SpikeTimeVO();

      spikeTime5.setTime("17:00");

      spikeTime5.setState("即将开始");

      spikeTime5.setRequestTime("2417");

		
      SpikeTimeVO spikeTime6 = new SpikeTimeVO();

      spikeTime6.setTime("19:00");

      spikeTime6.setState("即将开始");

      spikeTime6.setRequestTime("2419");

		
      SpikeTimeVO spikeTime7 = new SpikeTimeVO();

      spikeTime7.setTime("20:00");

      spikeTime7.setState("即将开始");

      spikeTime7.setRequestTime("2420");

		
		
      SpikeTimeVO spikeTime8 = new SpikeTimeVO();

      spikeTime8.setTime("21:00");

      spikeTime8.setState("即将开始");

      spikeTime8.setRequestTime("2421");

		
      list.add(spikeTime0);

      list.add(spikeTime1);

      list.add(spikeTime2);

      list.add(spikeTime3);

      list.add(spikeTime4);

      list.add(spikeTime5);

      list.add(spikeTime6);

      list.add(spikeTime7);

      list.add(spikeTime8);

		
      for (int i = 0; i < timeList.size(); i++) {

         SpikeTimeVO spikeTime1 = new SpikeTimeVO();

         spikeTime1.setTime(timeList.get(i).getTime().subSequence(2, 4) + ":00");

         if (timeList.get(i).getState() <= 0)

            spikeTime1.setState("进行中");

         else

            spikeTime1.setState("即将开始");

         if (timeList.get(i).getState() == 0)

            spikeTime1.setChecked(true);

         spikeTime1.setRequestTime(timeList.get(i).getTime());

         list.add(spikeTime1);

      }



      JSONObject data = new JSONObject();

      data.put("count", list.size());

      data.put("list", list);

      out.print(JsonUtil.loadTrueResult(data));	
      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
	


   /**

    * 限时秒杀列表

    * 
    * @param acceptData

    * @param page

    * @param auctionId

@@ -435,7 +395,7 @@
      List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(qtime);

      if (detailList0 == null)

         detailList0 = new ArrayList<>();

		


      List<DaTaoKeDetailV2> detailList = new ArrayList<>();

      detailList.addAll(detailList0);

      JSONArray array = new JSONArray();

@@ -449,13 +409,12 @@
            }

         }

      }

		


      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

      if (detailList != null) {

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

          ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());



         for (DaTaoKeDetailV2 detail : detailList) {

            array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), paramsDTO)));

@@ -465,12 +424,9 @@
      JSONObject data = new JSONObject();

      data.put("count", detailList.size());

      data.put("list", array);

      out.print(JsonUtil.loadTrueResult(data));	
      out.print(JsonUtil.loadTrueResult(data));

   }

	
	
	
	


   /**

    * 金币兑换信息

    * 

@@ -520,7 +476,7 @@
      }



      JSONObject params = new JSONObject();

      params.put("url", configService.get("search_discovery_h5_link"));

      params.put("url", configService.get(ConfigKeyEnum.searchDiscoveryH5Link.getKey()));



      JSONObject root = new JSONObject();

      root.put("picture", "http://img.flqapp.com/resource/home_search_found.png");

@@ -602,9 +558,8 @@
            }

         }



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

          ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());



         for (TaoBaoGoodsBrief goods : goodsList) {

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

@@ -622,13 +577,14 @@
            List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());

            if (list != null && list.size() > 0) {

               BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

                ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE);

               ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE,

                     hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));

               for (int i = list.size() - 1; i >= 0; i--) {

                  TLJBuyGoods goods = list.get(i);

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);



                  String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);



                  ReduceHongBao reduceHongBao = new ReduceHongBao();

                  reduceHongBao.setLeft(goods.getLeftHongBaoCount());

@@ -661,7 +617,7 @@
         if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

            long startTime = java.lang.System.currentTimeMillis();



            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);

            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa,"");



            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

               // 筛选

@@ -672,15 +628,14 @@


               // filter

               try {

                  gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);

                  gList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(gList);

               } catch (Exception e) {

               }



               // 设备推荐

               if (gList != null) {

                  BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                  BigDecimal shareRate = hongBaoManageService.getShareRate();

                   ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                  ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                        acceptData.getVersion());

                  for (TaoBaoGoodsBrief goods : gList) {

                     if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                           && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

@@ -715,10 +670,10 @@
               }

            }

         }

         JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);

         JSONArray localArray = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize,acceptData.getPlatform(),acceptData.getVersion());

         array.addAll(localArray);

      } else {// 从精选库来

         array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize);

         array = qualityGoodsService.getRecommendToIndexV2((page - 1) * pageSize, pageSize,acceptData.getPlatform(),acceptData.getVersion());

         if (array == null) {

            out.print(JsonUtil.loadFalseResult("没有更多了"));

            return;

@@ -751,9 +706,8 @@


         List<JDGoods> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

@@ -785,9 +739,8 @@
         Gson gson = JsonUtil.getApiCommonGson();

         List<PDDGoodsDetail> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

@@ -820,9 +773,8 @@
         JSONArray arrayKeys = JSONArray.fromObject(keys);

         if (arrayKeys != null && arrayKeys.size() > 0) {

            count = arrayKeys.size();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

             ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());



            int j = 1;

            for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {

@@ -835,7 +787,8 @@
               List<DaTaoKeDetailV2> listTaoKe = daTaoKeGoodsService.getSearchDiscoveryGoods(words);

               if (listTaoKe != null && listTaoKe.size() > 0) {

                  for (DaTaoKeDetailV2 daTaoKeDetailV2 : listTaoKe) {

                     listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), paramsDTO));

                     listGoods.add(

                           GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), paramsDTO));

                     if (listGoods.size() >= 3)

                        break;

                  }

@@ -885,12 +838,7 @@
         if (special.getState() == 1L) {

            list.remove(i--);

         } else {

            if (special.getStartTime() != null && special.getEndTime() != null)

               special.setTimeTask(true);

            else

               special.setTimeTask(false);

				
            if (special.isTimeTask()) {

            if (special.getStartTime() != null && special.getEndTime() != null) {

               if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {

                  list.remove(i--);

               } else// 设置倒计时

@@ -912,7 +860,6 @@
         out.print(JsonUtil.loadTrueResult(data));

   }



	
   /**

    * 获取专题渠道活动

    * 

@@ -925,7 +872,7 @@
   public void getGuide(AcceptData acceptData, Long uid, PrintWriter out) {

      String tips = null;

      if (uid == null || uid <= 0) {

         tips = configService.get("tip_guide_new_user");

         tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());

      } else {

         long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);

         long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);

@@ -933,21 +880,21 @@
            // 熟客版

         } else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {

            // 新人版

            tips = configService.get("tip_guide_new_user");

            tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());

         } else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {

            // 省钱版

            tips = configService.get("tip_guide_save_money");

            tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());

         } else {

            // 赚钱版

            tips = configService.get("tip_guide_share_invite");

         } 
            tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());

         }

      }

		


      if (StringUtil.isNullOrEmpty(tips)) {

         out.print(JsonUtil.loadFalseResult("暂无提示"));

         return;

      }

		


      JSONObject data = JSONObject.fromObject(tips);

      out.print(JsonUtil.loadTrueResult(data));

   }