From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index f410188..fbd2c38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/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();
--
Gitblit v1.8.0