From 837b1de6cd30d27b621222aa94b35bf43ef6f850 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 12 十二月 2018 14:35:09 +0800
Subject: [PATCH] 数据格式初始化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 7d5fb2c..f77013a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -9,7 +9,6 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.annotation.Resource;
@@ -773,7 +772,7 @@
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
String errorMsg = "";
- if (extractRecord != null && extractRecord.getCount() + 1 >= maxDayCount) {
+ if (extractRecord != null && extractRecord.getCount() + 1 > maxDayCount) {
canExtract = false;
errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s娆�", maxDayCount + "");
} else if (extractRecord != null
@@ -1505,15 +1504,13 @@
// collectionGoodsService.findCollectionGoods(uid, page + 1);
long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
JSONObject data = new JSONObject();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
collectionGoodsList.parallelStream().forEachOrdered(cg -> {
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate, "");
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), "");
taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());
list.add(taoBaoGoodsBriefExtra);
});
--
Gitblit v1.8.0