From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 62 ++++++++++++-------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index 2b762de..14fb5cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.apph5;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -18,10 +19,10 @@
import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.bus.lable.MergeClass;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
-import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
@@ -81,6 +82,9 @@
@Resource
private CollectionGoodsV2Service collectionGoodsV2Service;
+
+ @Resource
+ private HongBaoManageService hongBaoManageService;
/**
* 9.9鍟嗗搧
@@ -208,8 +212,7 @@
.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 = hongBaoManageService.getFanLiRate();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuery) {
@@ -234,7 +237,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -370,9 +373,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.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();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuery) {
@@ -397,7 +398,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -645,9 +646,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.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();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listMaterial) {
@@ -677,7 +676,7 @@
}
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
- proportion, fcRate, null);
+ proportion.toString(), null);
taoBaoGoodsBriefExtra.setCollected(collected);
array.add(gson.toJson(taoBaoGoodsBriefExtra));
@@ -822,9 +821,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.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();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listBrands) {
@@ -844,7 +841,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -886,9 +883,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.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();
// 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory quality : listQuery) {
@@ -914,7 +909,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -974,10 +969,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.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();
// 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory selectionGoods : listQuery) {
@@ -1002,7 +994,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -1045,19 +1037,16 @@
double tkRate = 20.00;
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
-
+ BigDecimal proportion = manageService.getFanLiRate();
List<QualityFactory> listQuery = qualityGoodsService.listQueryByRebateAmount((page - 1) * pageSize, pageSize,
- proportion, startAmount, endAmount, tkRate);
+ proportion.toString(), startAmount, endAmount, tkRate);
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
- long count = qualityGoodsService.countQueryByRebateAmount(proportion, startAmount, endAmount, tkRate);
+ long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount, tkRate);
// 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
JSONArray array = new JSONArray();
@@ -1088,7 +1077,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -1114,18 +1103,15 @@
int pageSize = Constant.PAGE_SIZE;
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
-
- JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);
+ BigDecimal proportion = manageService.getFanLiRate();
+ JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
return;
}
- long count = qualityGoodsService.countRecommendToIndex(proportion);
+ long count = qualityGoodsService.countRecommendToIndex(proportion.toString());
JSONObject data = new JSONObject();
data.put("count", count);
--
Gitblit v1.8.0