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/apph5/AppH5PushController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
index cf5c8e5..0b274b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.controller.apph5;
 
 import java.io.PrintWriter;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +61,9 @@
 
 	@Resource
 	private PushGoodsRecordService pushGoodsRecordService;
+	
+	@Resource
+	private HongBaoManageService hongBaoManageService;
 
 	/**
 	 * 鎺ㄩ�佸晢鍝佽鎯呴〉
@@ -92,8 +96,7 @@
 			if (list != null && list.size() > 0) {
 
 				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 (PushGoodsGroup pushGoodsGroup : list) {
 					CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
@@ -117,7 +120,7 @@
 						commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
 					}
 
-					array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null)));
+					array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
 				}
 			}
 

--
Gitblit v1.8.0