From d174ab82cbe0a18dbca6a5956a90f73c8aca54bb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 09:44:08 +0800
Subject: [PATCH] 动态分享修改返回参数
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 fec0bf2..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
@@ -22,12 +22,12 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
@@ -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