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/service/impl/user/ScanHistoryServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
index 46f74e1..4886fc7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Calendar;
@@ -216,12 +217,9 @@
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
List<TaoBaoGoodsBriefExtra> tbbeList = new ArrayList<TaoBaoGoodsBriefExtra>();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, rate.toString(), "");
tbbeList.add(taoBaoGoodsBriefExtra);
}
return tbbeList;
--
Gitblit v1.8.0