From 4a2eb8a3a00febe2a55e1d5538e7e13e9f7fae86 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 四月 2020 13:57:56 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 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 a526a71..9c01dc5 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
@@ -2,6 +2,10 @@
import java.math.BigDecimal;
+import com.alibaba.fastjson.JSONObject;
+import com.yeshi.fanli.dto.common.CategoryInfoDTO;
+import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;
+import com.yeshi.fanli.dto.jd.JDCategoryInfo;
import com.yeshi.fanli.dto.jd.JDCommissionInfo;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.jd.JDShopInfo;
@@ -11,6 +15,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 {
@@ -50,6 +55,23 @@
cg.setVideoUrl(null);
cg.setState(goods.getState());
cg.setMaterialLibType(goods.getMaterialLibType());
+
+
+ // 鍒嗙被淇℃伅
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ Integer rootCatId = goods.getRootCatId();
+ if (rootCatId != null) {
+ categoryInfo.setCid1(Long.parseLong(rootCatId.toString()));
+ }
+ categoryInfo.setCid1Name(goods.getRootCategoryName());
+
+ Integer leafCatId = goods.getLeafCatId();
+ if (leafCatId != null) {
+ categoryInfo.setCid2(Long.parseLong(leafCatId.toString()));
+ }
+ categoryInfo.setCid2Name(goods.getLeafName());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+
return cg;
}
@@ -65,7 +87,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();
@@ -78,6 +100,8 @@
} else {
cg.setCouponAmount(new BigDecimal(0));
}
+ cg.setCouponLeftCount(1);
+ cg.setCouponTotalCount(1);
}
JDCommissionInfo commissionInfo = goods.getCommissionInfo();
@@ -108,6 +132,27 @@
}
cg.setState(CommonGoods.STATE_NORMAL);
+
+ // 鍏朵粬淇℃伅
+ GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();
+ other.setOwner(owner); // 鏄惁鑷惀
+ other.setPinGouInfo( goods.getPinGouInfo()); // 鎷艰喘淇℃伅
+ other.setIsFreeShipping(goods.getIsFreeShipping()); // 鏄惁鍖呴偖
+ cg.setOtherInfo(JSONObject.toJSON(other).toString());
+
+
+ // 鍒嗙被淇℃伅
+ JDCategoryInfo categoryJD = goods.getCategoryInfo();
+ if (categoryJD != null) {
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ categoryInfo.setCid1(categoryJD.getCid1());
+ categoryInfo.setCid1Name(categoryJD.getCid1Name());
+ categoryInfo.setCid2(categoryJD.getCid2());
+ categoryInfo.setCid2Name(categoryJD.getCid2Name());
+ categoryInfo.setCid3(categoryJD.getCid3());
+ categoryInfo.setCid3Name(categoryJD.getCid3Name());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+ }
// 淇濈暀瀛楁
cg.setVideoCover(null);
@@ -147,17 +192,26 @@
cg.setGoodsType(CommonGoods.GOODS_TYPE_PDD);
cg.setPicture(goods.getGoodsThumbnailUrl());
cg.setPictureWhite(null);
- cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinNormalPrice()), new BigDecimal(100)));
+ cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)));
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());
@@ -169,6 +223,14 @@
cg.setVideoUrl(null);
cg.setState(goods.getState());
cg.setMaterialLibType(1);
+
+ // 鍒嗙被淇℃伅
+ CategoryInfoDTO categoryInfo = new CategoryInfoDTO();
+ categoryInfo.setCid1(goods.getCategoryId());
+ categoryInfo.setCid1Name(goods.getCategoryName());
+ cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());
+
+
return cg;
}
--
Gitblit v1.8.0