From 14106cfa437551ddcb06e00e151003d0fbe2aa15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 22 十月 2019 09:30:22 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 8d495de..dcd28c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -391,26 +391,11 @@
BigDecimal fanLiRate, BigDecimal shareRate) {
if (goodsInfo != null && goods != null) {
- // 璧勯噾淇℃伅
- MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
- moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));
- goodsInfo.setMoneyInfo(moneyInfoVO);
- // 璁剧疆鍒稿悗浠蜂负瀹氶噾浠锋牸
- if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
- goodsInfo.setCouponPrice(new BigDecimal(goods.getPresaleDeposit()));
- }
- goodsInfo.setZkPrice(new BigDecimal(goods.getPresaleDeposit()));
-
// 娣诲姞鏍囩
if (goodsInfo.getLabels() == null)
goodsInfo.setLabels(new ArrayList<>());
goodsInfo.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
- // 鍦ㄦ爣棰樻坊鍔犱紭鎯犱俊鎭�
- if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
- goodsInfo.setTitle(String.format("銆�%s銆�", goods.getPresaleDiscountFeeText()) + goodsInfo.getTitle());
- }
+
}
return goodsInfo;
}
--
Gitblit v1.8.0