帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

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

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

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

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

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

import com.yeshi.fanli.entity.dynamic.DynamicInfo;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

@@ -30,6 +31,7 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.taobao.DaTaoKeUtil;

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



@@ -59,6 +61,7 @@


   @Resource

   private SpecialService specialService;

	
   



   /**

@@ -133,7 +136,7 @@
         listKey.add("special_channel_pdd");

      }

      

      List<Special> list = specialService.listByPlaceKeyList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, listKey, platformCode,

      List<Special> list = specialService.listByPlaceKeyHasLabel((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, listKey, platformCode,

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

      

      long time = System.currentTimeMillis();

@@ -158,11 +161,13 @@
               }

            }

            

            if (Constant.IS_TEST) {// 测试标签

                List<ClientTextStyleVO> labels = new ArrayList<>();

                labels.add(new ClientTextStyleVO("文章标签", "#FE0014"));

                labels.add(new ClientTextStyleVO("标签内容", "#FE0014"));

                special.setLabels(labels);

            List<SpecialLabel> listLabels = special.getListLabels();

            if (listLabels != null && !listLabels.isEmpty()) {

               List<ClientTextStyleVO> labels = new ArrayList<>();

               for (SpecialLabel specialLabel: listLabels) {

                   labels.add(new ClientTextStyleVO(specialLabel.getName(), specialLabel.getBgColor()));

               }

               special.setLabels(labels);

            }

         }

      }

@@ -249,7 +254,11 @@
      list.add(menu1);

      list.add(menu5);

      list.add(menu2);

      list.add(menu3);

      // 2.0.5版本隐藏 好店栏目

      if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         list.add(menu3);

      }

		
      list.add(menu4);

      

      JSONObject data = new JSONObject();