From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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..8d178a9 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
@@ -14,8 +14,8 @@
 import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import org.yeshi.utils.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.jd.JDUtil;
 
@@ -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;
 	}
 
@@ -283,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);
@@ -303,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