fanli-server.git

			@@ -683,8 +683,7 @@
			return list;
			}

			public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion,
			String fcRateStr, String pid) {
			public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion, String pid) {
			TaoBaoGoodsBriefExtra tg = new TaoBaoGoodsBriefExtra();
			tg.setId(tb.getId());
			tg.setAuctionId(tb.getAuctionId());
			@@ -715,17 +714,6 @@
			tg.setTaoBaoQuanInfo(quanInfo);
			}
			TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
			BigDecimal fcRate = BigDecimal.valueOf(1);
			String eventRate = tb.getEventRate();
			BigDecimal rate = BigDecimal.valueOf(0);
			if (eventRate == null) {
			rate = tb.getTkRate();
			} else {
			rate = new BigDecimal(eventRate);
			if (fcRateStr != null) {
			fcRate = (new BigDecimal(fcRateStr).divide(BigDecimal.valueOf(100)));
			}
			}

			hongBaoInfo.setRate("最高40%");

			@@ -965,19 +953,8 @@
			tg.setTaoBaoQuanInfo(quanInfo);
			}

			Map<String, String> convertMap = taoBaoUtil.manageService.convertMap();
			String proportion = convertMap.get("hongbao_goods_proportion");
			String fcRateStr = convertMap.get("hongbao_fc_ratio");
			BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();
			TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
			String eventRate = tb.getEventRate();
			BigDecimal rate = BigDecimal.valueOf(0);
			if (eventRate != null) {
			rate = new BigDecimal(eventRate);
			} else {
			rate = tb.getTkRate();
			}
			BigDecimal fcRate = new BigDecimal(fcRateStr);

			String tkMktStatus = tb.getTkMktStatus();
			if ("1".equals(tkMktStatus)) {
			hongBaoInfo.setType(1);
			@@ -985,7 +962,7 @@

			hongBaoInfo.setRate("最高40%");

			String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion));
			String hongbao = getGoodsHongBaoInfo(tb, proportion);
			if (!hongbao.contains("最高"))
			hongBaoInfo.setHongbao(new BigDecimal(hongbao.replace("¥", "")));
			else
			@@ -1060,7 +1037,6 @@
			}
			return tb;
			}


			public static ScanHistory getScanHistory(TaoBaoGoodsBrief tb) {
			ScanHistory sh = new ScanHistory();
			@@ -1367,8 +1343,6 @@
			return taoBaoGoodsBrief;
			}



			/**
			* 获取商品的用户分成比例
			*
			@@ -1379,17 +1353,21 @@
			* @return
			*/
			public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
			// 营销计划
			// if ("1".equalsIgnoreCase(goodsBrief.getTkMktStatus())) {
			// return "最高40%";
			// } else {
			// 计算返利
			// 无券
			return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
			}

			/**
			* 获取淘宝商品该获得多少佣金
			*
			* @param goodsBrief
			* @param rate
			* @return
			*/
			public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
			if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())
			\|\| goodsBrief.getCouponInfo().trim().equalsIgnoreCase("无")) {
			return "¥" + goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
			.multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);

			return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
			.setScale(2, BigDecimal.ROUND_DOWN);
			} else// 有券
			{
			List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goodsBrief.getCouponInfo());
			@@ -1398,15 +1376,15 @@
			if (startFee.compareTo(goodsBrief.getZkPrice()) <= 0
			&& goodsBrief.getZkPrice().compareTo(couponAccount) > 0) {
			BigDecimal finalPrice = goodsBrief.getZkPrice().subtract(couponAccount);
			return "¥" + finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
			return finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
			.setScale(2, BigDecimal.ROUND_DOWN);

			} else {// 不能用券
			return "¥" + goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
			return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
			.multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);
			}
			}
			}

			// }

			// 获取券的红包显示