From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |   19 ++++++++++++++++---
 1 files changed, 16 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 c2bc6ef..271eb13 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
@@ -13,6 +13,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
 
 public class CommonGoodsFactory {
 
@@ -67,7 +68,7 @@
 			return null;
 
 		CommonGoods cg = new CommonGoods();
-		JDCouponInfo couponInfo = goods.getCouponInfo();
+		JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
 		if (couponInfo != null) {
 			cg.setCouponStartPrice(couponInfo.getQuota());
 			BigDecimal discount = couponInfo.getDiscount();
@@ -80,6 +81,8 @@
 			} else {
 				cg.setCouponAmount(new BigDecimal(0));
 			}
+			cg.setCouponLeftCount(1);
+			cg.setCouponTotalCount(1);
 		}
 		
 		JDCommissionInfo commissionInfo = goods.getCommissionInfo();
@@ -115,6 +118,7 @@
 		GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();
 		other.setOwner(owner); // 鏄惁鑷惀
 		other.setPinGouInfo( goods.getPinGouInfo());  // 鎷艰喘淇℃伅
+		other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
 		cg.setOtherInfo(JSONObject.toJSON(other).toString());
 		
 		// 淇濈暀瀛楁
@@ -160,12 +164,21 @@
 		String salesTip = goods.getSalesTip();
 		if (StringUtil.isNullOrEmpty(salesTip)) {
 			salesTip = "0";
+		} else {
+			int indexOf = salesTip.indexOf("+");
+			if (indexOf > 0) {
+				salesTip = salesTip.substring(0, indexOf);
+			}
 		}
 		
+		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