商品店铺搜索

yujian

2019-03-25 faf76ce65bb8f767fbbf040982f2a7fa1fea89b2

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

@@ -33,13 +33,11 @@
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;

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

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

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.ShamUser;

@@ -405,25 +403,27 @@
      if (!"1".equals(version) && "android".equalsIgnoreCase(acceptData.getPlatform())) {

         jumpDetail = jumpDetailService.getlastJumpDetailCache();

      }

      List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService

            .getSuperRecommendSpecialBySystemId(system.getId());



      List<RecommendSpecial> recommendSpecialList = null;

      for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

         if (recommendSpecialList == null) {

            recommendSpecialList = new ArrayList<RecommendSpecial>();

		
      List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService.getSuperRecommendSpecialBySystemId(system.getId());

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

			
         recommendSpecialList = new ArrayList<RecommendSpecial>();

			
         for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

            RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

            if (jumpDetail != null) {

               recommendSpecial.setJumpDetail(jumpDetail);

            }

            recommendSpecialList.add(recommendSpecial);

         }

         RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

         if (jumpDetail != null) {

            recommendSpecial.setJumpDetail(jumpDetail);

         }

         recommendSpecialList.add(recommendSpecial);

      }



		
      if (recommendSpecialList == null || recommendSpecialList.size() == 0) {

         out.print(JsonUtil.loadFalseResult(1, "暂无数据"));

         return;

      }

		
      JSONObject data = new JSONObject();

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

      Gson gson = new Gson();

@@ -1369,26 +1369,8 @@
      }



      // 首页Banner

      List<RecommendBannerV2> listBanner = null;

      List<RecommendBannerV2> listBanner = superRecommendBannerV2Service.getSuperRecommendBannerV2sBySystem(system.getId());



      List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system);



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



         listBanner = new ArrayList<RecommendBannerV2>();



         for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {

            RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();

            // 淘特价暂时修改

            if (system.getId() == 7) {

               recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()

                     .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));

            }



            listBanner.add(recommendBanner);

         }

      }



      JSONObject root = new JSONObject();

      root.put("banner", listBanner);