yujian
2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908
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;