From 6f3ee199558c79d840137c1a77efe462aca63178 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 26 七月 2019 18:04:21 +0800
Subject: [PATCH] 京东专题 + 拼多多

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 c2bc6ef..88ba0e9 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
@@ -115,6 +115,7 @@
 		GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();
 		other.setOwner(owner); // 鏄惁鑷惀
 		other.setPinGouInfo( goods.getPinGouInfo());  // 鎷艰喘淇℃伅
+		other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
 		cg.setOtherInfo(JSONObject.toJSON(other).toString());
 		
 		// 淇濈暀瀛楁
@@ -162,10 +163,14 @@
 			salesTip = "0";
 		}
 		
+		int totalSales = 0;
 		if (salesTip.contains("涓�")) {
-			salesTip = salesTip.replace("涓�", "") + "0000";
+			salesTip = salesTip.substring(0, salesTip.indexOf("涓�"));
+			totalSales= (int) (Float.parseFloat(salesTip) * 10000);
+		} else {
+			totalSales = Integer.parseInt(salesTip);
 		}
-		cg.setSales(Integer.parseInt(salesTip));
+		cg.setSales(totalSales);
 		cg.setRate(MoneyBigDecimalUtil.div(new BigDecimal(goods.getPromotionRate()), new BigDecimal(10)));
 		cg.setSellerId(goods.getMallId());
 		cg.setSellerName(goods.getMallName());

--
Gitblit v1.8.0