From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 c166ac1..3588346 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
@@ -285,8 +285,15 @@
 			cg.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", goods.getCouponInfo().getBounsLimit(),
 					goods.getCouponInfo().getCouponValue()));
 			cg.setCouponAmount(new BigDecimal(goods.getCouponInfo().getCouponValue()));
-			cg.setCouponLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
-			cg.setCouponTotalCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
+			
+			if (goods.getCouponInfo().getCouponCount() == null) {
+				cg.setCouponLeftCount(500000);
+				cg.setCouponTotalCount(500000);
+			} else {
+				cg.setCouponLeftCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
+				cg.setCouponTotalCount(Integer.parseInt(goods.getCouponInfo().getCouponCount()));
+			}
+			
 			cg.setCouponStartPrice(new BigDecimal(goods.getCouponInfo().getBounsLimit()));
 		} else {
 			cg.setCouponLeftCount(0);
@@ -305,7 +312,7 @@
 		cg.setRate(new BigDecimal(goods.getCommodityInfo().getRate()));
 		cg.setSellerId(Long.parseLong(goods.getCommodityInfo().getSupplierCode()));
 		cg.setSellerName(goods.getCommodityInfo().getSupplierName());
-		cg.setShopType(CommonGoods.SHOP_TYPE_PDD);
+		cg.setShopType(CommonGoods.SHOP_TYPE_SUNING);
 		cg.setState(CommonGoods.STATE_NORMAL);
 		cg.setTitle(goods.getCommodityInfo().getCommodityName());
 		// 淇濈暀瀛楁

--
Gitblit v1.8.0