Merge remote-tracking branch 'origin/master'

Administrator

2018-11-13 06a7debe678e7ae30f39c61a7f71a926d52d1ae7

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -20,8 +20,7 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;



import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

@@ -30,6 +29,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.bus.recommend.Honest;

import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;

@@ -78,7 +78,9 @@
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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

@@ -195,6 +197,13 @@


   @Resource

   private ShamUserService shamUserService;


   @Resource

   private SpecialService specialService;

	
   @Resource

   private SwiperPictureService swiperPictureService;

	


   @Resource

   private MonitorService monitorService;

@@ -1472,7 +1481,7 @@
    */

   @RequestMapping(value = "getRecommendInfo")

   public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {



		
      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -1570,6 +1579,116 @@
      out.print(JsonUtil.loadTrueResult(root));

   }




   /**

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

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getNewRecommendInfo")

   public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }

		
      List<SwiperPicture> listswiper =  null;

      if (!StringUtil.isNullOrEmpty(specialCard)) {

         try {

				
            listswiper = swiperPictureService.getByBannerCard(swiperCard);

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

               for (SwiperPicture swiperPicture: listswiper) {

                  swiperPicture.setBannerId(null);

                  swiperPicture.setCreatetime(null);

                  swiperPicture.setUpdatetime(null);

                  swiperPicture.setState(null);

                  swiperPicture.setRemark(null);

               }

            }

				
         } catch (Exception e) {

            e.printStackTrace();

         }

      }

		
      Special miaoShaSpecial = null;

      List<Special> honestList =  new ArrayList<Special>();

      List<Special> specialList = new ArrayList<Special>();



      if (!StringUtil.isNullOrEmpty(specialCard)) {

         try {

            List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());

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

               for (Special special: listSpecial) {

                  special.setCreatetime(null);

                  special.setUpdatetime(null);

                  special.setState(null);

                  special.setRemark(null);

                  special.setCard(null);

                  special.setCardId(null);

						
                  if ("限时秒杀".equals(special.getName())) {

                     miaoShaSpecial = special;

                     continue;

                  }

						
                  if ("arc".equals(special.getShowType())) {

                     // 同一行专题

                     honestList.add(special);

                  } else {

                     // 其他专题

                     specialList.add(special);

                  }

               }

            }

				
         } catch (Exception e) {

            e.printStackTrace();

         }

			
      }



      /* 限时秒杀 - 时间处理 */

      JSONObject msJSON = JSONObject.fromObject(new Gson().toJson(miaoShaSpecial));

      if (miaoShaSpecial != null) {

         // 获取秒杀

         int[] hours = new int[] { 0, 9, 12, 14, 16, 20, 22 };

         int hour = -1;

         Calendar calendar = Calendar.getInstance();

         calendar.setTimeInMillis(Long.parseLong(acceptData.getTime()));

         int nowHour = calendar.get(Calendar.HOUR_OF_DAY);

         for (int i = 0; i < hours.length - 1; i++) {

            if (nowHour >= hours[i] && nowHour < hours[i + 1]) {

               hour = hours[i + 1];

               break;

            }

         }

			
         if (hour < 0)

            hour = 24;

         long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),

               "yyyy-MM-dd") + 1000 * 60 * 60 * hour;

         msJSON.put("time", time);

      }



      JSONObject root = new JSONObject();

      root.put("banner", listswiper);

      root.put("honest", honestList);

      root.put("special", specialList);

      root.put("miaoSha", msJSON);



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

		
   }

	
	
	
   /**

    * 商品基本详情 (1.4.0)

    *