From 824d003d330a25b1f5b1e9ed30e4ad868868c2ab Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 01 六月 2020 16:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
index 247959c..c166ac1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
@@ -269,7 +269,9 @@
 		categoryInfo.setCid1(goods.getCategoryId());
 		categoryInfo.setCid1Name(goods.getCategoryName());
 		cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
-
+		//瀛樻斁鎶樻墸浠�
+		cg.setCouponStartPrice(new BigDecimal(goods.getVipPrice()));
+		cg.setCouponInfo(MoneyBigDecimalUtil.getWithNoZera(MoneyBigDecimalUtil.mul(new BigDecimal(goods.getDiscount()), new BigDecimal(10))) + "鎶�");
 		return cg;
 	}
 

--
Gitblit v1.8.0