From d4c19062530c46203b0950b20e66afdeefcdf3a6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java | 113 +++++++++++++++++++++++++-------------------------------
1 files changed, 50 insertions(+), 63 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
index dd4e65f..1cbcfc3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
@@ -42,10 +42,9 @@
@Resource
private TaoBaoShopService taoBaoShopService;
-
+
@Resource
private QualityGoodsService qualityGoodsService;
-
@Cacheable(value = "taoKeMaterialCache", key = "'listByMaterial-'+#materialId +'-'+#pageIndex")
@Override
@@ -80,8 +79,8 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+
+ BigDecimal proportion = manageService.getFanLiRate();
listGoods.parallelStream().forEach(taoBaoGoodsBrief -> {
@@ -119,8 +118,8 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- arrayGoods
- .add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ arrayGoods.add(
+ gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
});
@@ -209,8 +208,7 @@
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)
@@ -229,10 +227,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 {
@@ -254,13 +252,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);
}
}
@@ -286,8 +284,7 @@
return result.getTaoBaoGoodsBriefs();
}
-
-
+
@Override
public JSONObject listByWuLiao(int page, String key, String cateIds, String filterParams, String order,
String startprice, String endprice, String searchParam) {
@@ -418,9 +415,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)
@@ -430,10 +425,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 {
@@ -445,13 +440,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);
}
}
@@ -465,13 +460,11 @@
return data;
}
-
-
- @Override
- public void setSearchFilter(SearchFilter searchfilter, String filter, String order,
- String startprice, String endprice, String fastFilter, Integer totalSales) {
-
+ @Override
+ public void setSearchFilter(SearchFilter searchfilter, String filter, String order, String startprice,
+ String endprice, String fastFilter, Integer totalSales) {
+
if (!StringUtil.isNullOrEmpty(startprice)) {
searchfilter.setStartPrice(new BigDecimal(startprice));
}
@@ -512,8 +505,7 @@
}
}
}
-
-
+
if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {
if (Integer.parseInt(order) == 1 || Integer.parseInt(order) == 0) {
searchfilter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
@@ -529,60 +521,55 @@
} else {
searchfilter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
}
-
+
}
-
@Override
- @Cacheable(value = "qualityCache",key="'countByQuality-'+#start+'-'+#searchKey+'-'+#systemCid+'-'+#listLabId")
- public List<QualityFactory> queryByQuality(long start, int count,String searchKey, Long systemCid,
+ @Cacheable(value = "qualityCache", key = "'countByQuality-'+#start+'-'+#searchKey+'-'+#systemCid+'-'+#listLabId")
+ public List<QualityFactory> queryByQuality(long start, int count, String searchKey, Long systemCid,
List<Long> listLabId) {
-
+
/* 1銆� 绮鹃�夊簱绛涢�� */
List<QualityFactory> listQuality = null;
-
+
if (listLabId != null && listLabId.size() > 0) {
// 鍚爣绛�
- listQuality = qualityGoodsService.listQueryByKeyAndlabIDs(start, count, searchKey,
- listLabId, null, systemCid, null, null, null, null, null);
- } else {
- listQuality = qualityGoodsService.listQueryByKey(start, count, searchKey, null,
+ listQuality = qualityGoodsService.listQueryByKeyAndlabIDs(start, count, searchKey, listLabId, null,
systemCid, null, null, null, null, null);
+ } else {
+ listQuality = qualityGoodsService.listQueryByKey(start, count, searchKey, null, systemCid, null, null, null,
+ null, null);
}
-
+
return listQuality;
}
-
@Override
- @Cacheable(value = "qualityCache",key="'countByQuality-'+#searchKey+'-'+#systemCid+'-'+#listLabId")
+ @Cacheable(value = "qualityCache", key = "'countByQuality-'+#searchKey+'-'+#systemCid+'-'+#listLabId")
public long countByQuality(String searchKey, Long systemCid, List<Long> listLabId) {
-
+
long incount = 0;
-
+
if (listLabId != null && listLabId.size() > 0) {
// 鍚爣绛�
- incount = qualityGoodsService.countQueryKeyAndlabIDs(searchKey, listLabId, systemCid,
- null, null, null, null, null);
+ incount = qualityGoodsService.countQueryKeyAndlabIDs(searchKey, listLabId, systemCid, null, null, null,
+ null, null);
} else {
incount = qualityGoodsService.countQueryByKey(searchKey, systemCid, null, null, null, null, null);
}
-
+
return incount;
}
-
-
@Override
- public JSONObject listQualityGoods(List<QualityFactory> listQuality, List<TaoBaoGoodsBrief> searchWuLiaoList,
- Map<String, String> map ) {
-
+ public JSONObject listQualityGoods(List<QualityFactory> listQuality, List<TaoBaoGoodsBrief> searchWuLiaoList,
+ Map<String, String> map) {
+
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+
+ BigDecimal proportion = manageService.getFanLiRate();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuality) {
@@ -602,7 +589,7 @@
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
if (searchWuLiaoList != null && searchWuLiaoList.size() > 0) {
@@ -620,7 +607,7 @@
}
array.add(gson
- .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
}
@@ -631,8 +618,8 @@
data.put("nav", gsonBuilder.toJson(navList));
data.put("count", 5000);
data.put("result", array);
-
+
return data;
}
-
+
}
--
Gitblit v1.8.0