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/controller/client/S11Controller.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/S11Controller.java
index 32ff81e..41663fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/S11Controller.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -99,14 +100,12 @@
List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsCache(page);
JSONArray array = new JSONArray();
if (list != null) {
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true
: false;
for (TaoBaoGoodsBrief goods : list) {
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "");
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
if (!is11)
extra.setShopType(3);
array.add(gson.toJson(extra));
@@ -123,14 +122,12 @@
List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsByType(key, page);
JSONArray array = new JSONArray();
if (list != null) {
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true
: false;
for (TaoBaoGoodsBrief goods : list) {
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "");
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
if (!is11)
extra.setShopType(3);
array.add(gson.toJson(extra));
--
Gitblit v1.8.0