主分类 + 子分类 DAO改造

yujian

2019-03-27 cdcbed9af813b2a02cdc01eefa24db8bec6b51a9

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

@@ -38,7 +38,6 @@
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;

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

         jumpDetail = jumpDetailService.getlastJumpDetailCache();

      }

      List<RecommendSpecial> recommendSpecialList = null;



      List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService

            .getSuperRecommendSpecialBySystemId(system.getId());

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



      List<RecommendSpecial> recommendSpecialList = null;

      for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

         if (recommendSpecialList == null) {

            recommendSpecialList = new ArrayList<RecommendSpecial>();

         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();

@@ -1307,7 +1309,7 @@
               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

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

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

                        && goods.getBiz30day() > 1000)

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))

                     goodsList.add(goods);

               }

               try {

@@ -1368,8 +1370,8 @@
      }



      // 首页Banner

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



      List<RecommendBannerV2> listBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system.getId());



      JSONObject root = new JSONObject();

      root.put("banner", listBanner);