From 517f945fbf9dcd11211de87ea268aeb3a478f657 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 15:37:16 +0800
Subject: [PATCH] 增加邀请有奖入口
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
index 6288178..05cfc92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
@@ -59,10 +59,10 @@
@Resource
private SystemService systemService;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private SuperHotSearchService superHotSearchSerivce;
@@ -140,11 +140,9 @@
data.put("nav", gson.toJson(navList));
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
}
Gson gson2 = JsonUtil.getApiCommonGson();
data.put("result", gson2.toJson(re));
@@ -315,9 +313,7 @@
int fq = sf.getQuan();
int fh = sf.getHongbao();
boolean ft = sf.isTmall();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (fq == 0 && fh == 0 && !ft) {
if (result != null && result.getTaoBaoGoodsBriefs() != null)
for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
@@ -326,10 +322,10 @@
double sales = count;
String salesCountMidea = String.format("%.1f", sales / 10000);
bf.setSalesCount(salesCountMidea + "涓�");
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
} else {
bf.setSalesCount(count + "");
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
}
}
} else {
@@ -341,13 +337,13 @@
double sales = count;
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), "");
re.add(taoBaoGoodsBriefExtra);
} else {
taoBaoGoodsBrief.setSalesCount(count + "");
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), "");
re.add(taoBaoGoodsBriefExtra);
}
}
@@ -520,7 +516,7 @@
if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(endprice)) {
sf.setEndPrice(new BigDecimal(endprice));
}
-
+
if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {
if (Integer.parseInt(order) == 1) {
sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
@@ -617,11 +613,11 @@
setSearchTkRate(3, sf);
} else if ("tkRate5".equalsIgnoreCase(ty)) {
setSearchTkRate(4, sf);
- }
+ }
}
sf.setParams(params);
}
-
+
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
if (result == null) {
return null;
@@ -639,8 +635,7 @@
int fh = sf.getHongbao();
boolean ft = sf.isTmall();
Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (fq == 0 && fh == 0 && !ft) {
if (result != null && result.getTaoBaoGoodsBriefs() != null)
for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
@@ -649,10 +644,10 @@
double sales = count;
String salesCountMidea = String.format("%.1f", sales / 10000);
bf.setSalesCount(salesCountMidea + "涓�");
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
} else {
bf.setSalesCount(count + "");
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
}
}
} else {
@@ -664,13 +659,13 @@
double sales = count;
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), "");
re.add(taoBaoGoodsBriefExtra);
} else {
taoBaoGoodsBrief.setSalesCount(count + "");
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), "");
re.add(taoBaoGoodsBriefExtra);
}
}
@@ -694,7 +689,7 @@
* @return
*/
private JSONObject searchQualityGoods(String key, int page, String filter, String order, String startprice,
- String endprice ) {
+ String endprice) {
Integer hasQuan = null;
Integer userType = null;
@@ -703,7 +698,7 @@
Integer sort = null;
Double startTkRate = null;
Double endTkRate = null;
-
+
int provinceId = -100;
// 璧峰浠锋牸
@@ -821,7 +816,7 @@
}
}
}
- }
+ }
}
}
@@ -831,10 +826,7 @@
userType, start_Price, end_Price, startTkRate, endTkRate, sort);
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
-
+ BigDecimal proportion = manageService.getFanLiRate();
/* 閬嶅巻鍒楄〃鏁版嵁 */
if (listQuery != null && listQuery.size() > 0) {
for (QualityFactory selectionGoods : listQuery) {
@@ -860,11 +852,12 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));
+ listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
}
}
- long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price, startTkRate, endTkRate);
+ long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price,
+ startTkRate, endTkRate);
// 璁剧疆鍙戣揣鍦板潃
TaoBaoSearchNav nav = new TaoBaoSearchNav();
@@ -904,33 +897,34 @@
/**
* 璁剧疆鏌ヨ浣ｉ噾姣斾緥鑼冨洿
+ *
* @param i
* @param sf
*/
public void setSearchTkRate(int i, SearchFilter sf) {
// 鑾峰彇瀵瑰簲鍙傛暟
String value = configService.get("tkRate_range");
-
+
if (!StringUtil.isNullOrEmpty(value)) {
-
+
JSONArray tkRatearray = JSONArray.fromObject(value);
-
+
if (tkRatearray != null) {
-
+
String start = tkRatearray.optJSONObject(i).optString("start");
-
+
if (!StringUtil.isNullOrEmpty(start)) {
int tkRate = (int) (Float.parseFloat(start) * 100);
sf.setStartTkRate(tkRate);
}
-
+
String end = tkRatearray.optJSONObject(i).optString("end");
if (!StringUtil.isNullOrEmpty(end)) {
int tkRate = (int) (Float.parseFloat(end) * 100);
sf.setEndTkRate(tkRate);
}
}
-
+
}
}
}
--
Gitblit v1.8.0