From 35ab4226899cba623b38441250920b3773325518 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 10:33:41 +0800
Subject: [PATCH] 红包返利比例引用修改
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
index 6033dc6..6264bef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -400,14 +400,12 @@
List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);
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>();
coList.parallelStream().forEachOrdered(cg -> {
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate, "");
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), "");
list.add(taoBaoGoodsBriefExtra);
});
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
--
Gitblit v1.8.0