From 856d99bb5adf7f8670206b01750bc0260b8666d2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 二月 2023 15:36:55 +0800
Subject: [PATCH] 修复客户端特价首页商品列表无数据的问题

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java |  233 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 126 insertions(+), 107 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
index 5e4f235..1a921e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
@@ -1,107 +1,126 @@
-package com.yeshi.fanli.util.factory;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
-import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
-import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
-import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.order.CommonOrderGoods;
-import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.util.Constant;
-import org.yeshi.utils.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
-
-public class CommonOrderGoodsFactory {
-
-	public static CommonOrderGoods create(TaoBaoGoodsBrief goods) {
-		if (goods == null)
-			return null;
-		CommonOrderGoods orderGoods = new CommonOrderGoods();
-		orderGoods.setGoodsId(goods.getAuctionId() + "");
-		orderGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-		orderGoods.setPicture(goods.getPictUrl());
-		orderGoods.setPrice(goods.getZkPrice());
-		orderGoods.setShopId(goods.getSellerId());
-		orderGoods.setShopName(goods.getShopTitle());
-		if (goods.getUserType() == 0)
-			orderGoods.setShopType(CommonOrderGoods.TYPE_TAOBAO);
-		else
-			orderGoods.setShopType(CommonOrderGoods.TYPE_TMALL);
-		orderGoods.setTitle(goods.getTitle());
-		return orderGoods;
-	}
-
-	public static CommonOrderGoods create(PDDGoodsDetail detail) {
-		CommonOrderGoods goods = new CommonOrderGoods();
-		goods.setGoodsId(detail.getGoodsId() + "");
-		goods.setCreateTime(new Date());
-		goods.setGoodsType(Constant.SOURCE_TYPE_PDD);
-		goods.setPicture(detail.getGoodsThumbnailUrl());
-		goods.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(detail.getMinNormalPrice()), new BigDecimal(100)));
-		goods.setShopId(detail.getMallId());
-		goods.setShopName(detail.getMallName());
-		goods.setShopType(detail.getMerchantType() + "");
-		goods.setState(0);
-		goods.setTitle(detail.getGoodsName());
-		return goods;
-	}
-
-	public static CommonOrderGoods create(JDGoods jdGoods) {
-		CommonOrderGoods goods = new CommonOrderGoods();
-		goods.setGoodsId(jdGoods.getSkuId() + "");
-		goods.setCreateTime(new Date());
-		goods.setGoodsType(Constant.SOURCE_TYPE_JD);
-		if (jdGoods.getImageList() != null && jdGoods.getImageList().size() > 0)
-			goods.setPicture(jdGoods.getImageList().get(0));
-		goods.setPrice(jdGoods.getPrice());
-		if (jdGoods.getShopInfo() != null) {
-			goods.setShopId((long) jdGoods.getShopInfo().getShopId());
-			goods.setShopName(jdGoods.getShopInfo().getShopName());
-		}
-		goods.setShopType(jdGoods.getOwner());
-		goods.setState(0);
-		goods.setTitle(jdGoods.getSkuName());
-		return goods;
-	}
-
-	public static CommonOrderGoods create(VIPGoodsInfo vipGoods) {
-		CommonOrderGoods goods = new CommonOrderGoods();
-		goods.setGoodsId(vipGoods.getGoodsId() + "");
-		goods.setCreateTime(new Date());
-		goods.setGoodsType(Constant.SOURCE_TYPE_VIP);
-		goods.setPicture(vipGoods.getGoodsMainPicture());
-		goods.setPrice(new BigDecimal(vipGoods.getVipPrice()));
-		if (vipGoods.getBrandId() != null) {
-			goods.setShopId(vipGoods.getBrandId());
-			goods.setShopName(vipGoods.getBrandName());
-		}
-		goods.setShopType("鍞搧浼�");
-		goods.setState(0);
-		goods.setTitle(vipGoods.getGoodsName());
-		return goods;
-	}
-
-	public static CommonOrderGoods create(SuningGoodsInfo suningGoods) {
-		CommonOrderGoods goods = new CommonOrderGoods();
-		goods.setGoodsId(suningGoods.getCommodityInfo().getCommodityCode());
-		goods.setCreateTime(new Date());
-		goods.setGoodsType(Constant.SOURCE_TYPE_SUNING);
-		if (suningGoods.getCommodityInfo().getPictureUrl().size() > 0)
-			goods.setPicture(suningGoods.getCommodityInfo().getPictureUrl().get(0).getPicUrl());
-		
-		String commodityPrice = suningGoods.getCommodityInfo().getCommodityPrice();
-		if (StringUtil.isNullOrEmpty(commodityPrice)) {
-			commodityPrice = suningGoods.getCommodityInfo().getSnPrice();
-		}
-		goods.setPrice(new BigDecimal(commodityPrice));
-		goods.setShopId(Long.parseLong(suningGoods.getCommodityInfo().getSupplierCode()));
-		goods.setShopName(suningGoods.getCommodityInfo().getSupplierName());
-		goods.setShopType("鑻忓畞");
-		goods.setState(0);
-		goods.setTitle(suningGoods.getCommodityInfo().getCommodityName());
-		return goods;
-	}
-
-}
+package com.yeshi.fanli.util.factory;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Date;
+
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.order.CommonOrderGoods;
+import com.yeshi.fanli.util.goods.douyin.vo.DYGoods;
+import com.yeshi.fanli.util.goods.douyin.vo.DYGoodsDetail;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.util.Constant;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
+
+public class CommonOrderGoodsFactory {
+
+    public static CommonOrderGoods create(TaoBaoGoodsBrief goods) {
+        if (goods == null)
+            return null;
+        CommonOrderGoods orderGoods = new CommonOrderGoods();
+        orderGoods.setGoodsId(goods.getAuctionId() + "");
+        orderGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+        orderGoods.setPicture(goods.getPictUrl());
+        orderGoods.setPrice(goods.getZkPrice());
+        orderGoods.setShopId(goods.getSellerId());
+        orderGoods.setShopName(goods.getShopTitle());
+        if (goods.getUserType() == 0)
+            orderGoods.setShopType(CommonOrderGoods.TYPE_TAOBAO);
+        else
+            orderGoods.setShopType(CommonOrderGoods.TYPE_TMALL);
+        orderGoods.setTitle(goods.getTitle());
+        return orderGoods;
+    }
+
+    public static CommonOrderGoods create(PDDGoodsDetail detail) {
+        CommonOrderGoods goods = new CommonOrderGoods();
+        goods.setGoodsId(detail.getGoodsId() + "");
+        goods.setCreateTime(new Date());
+        goods.setGoodsType(Constant.SOURCE_TYPE_PDD);
+        goods.setPicture(detail.getGoodsThumbnailUrl());
+        goods.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(detail.getMinNormalPrice()), new BigDecimal(100)));
+        goods.setShopId(detail.getMallId());
+        goods.setShopName(detail.getMallName());
+        goods.setShopType(detail.getMerchantType() + "");
+        goods.setState(0);
+        goods.setTitle(detail.getGoodsName());
+        return goods;
+    }
+
+    public static CommonOrderGoods create(JDGoods jdGoods) {
+        CommonOrderGoods goods = new CommonOrderGoods();
+        goods.setGoodsId(jdGoods.getSkuId() + "");
+        goods.setCreateTime(new Date());
+        goods.setGoodsType(Constant.SOURCE_TYPE_JD);
+        if (jdGoods.getImageList() != null && jdGoods.getImageList().size() > 0)
+            goods.setPicture(jdGoods.getImageList().get(0));
+        goods.setPrice(jdGoods.getPrice());
+        if (jdGoods.getShopInfo() != null) {
+            goods.setShopId((long) jdGoods.getShopInfo().getShopId());
+            goods.setShopName(jdGoods.getShopInfo().getShopName());
+        }
+        goods.setShopType(jdGoods.getOwner());
+        goods.setState(0);
+        goods.setTitle(jdGoods.getSkuName());
+        return goods;
+    }
+
+    public static CommonOrderGoods create(VIPGoodsInfo vipGoods) {
+        CommonOrderGoods goods = new CommonOrderGoods();
+        goods.setGoodsId(vipGoods.getGoodsId() + "");
+        goods.setCreateTime(new Date());
+        goods.setGoodsType(Constant.SOURCE_TYPE_VIP);
+        goods.setPicture(vipGoods.getGoodsMainPicture());
+        goods.setPrice(new BigDecimal(vipGoods.getVipPrice()));
+        if (vipGoods.getBrandId() != null) {
+            goods.setShopId(vipGoods.getBrandId());
+            goods.setShopName(vipGoods.getBrandName());
+        }
+        goods.setShopType("鍞搧浼�");
+        goods.setState(0);
+        goods.setTitle(vipGoods.getGoodsName());
+        return goods;
+    }
+
+    public static CommonOrderGoods create(SuningGoodsInfo suningGoods) {
+        CommonOrderGoods goods = new CommonOrderGoods();
+        goods.setGoodsId(suningGoods.getCommodityInfo().getCommodityCode());
+        goods.setCreateTime(new Date());
+        goods.setGoodsType(Constant.SOURCE_TYPE_SUNING);
+        if (suningGoods.getCommodityInfo().getPictureUrl().size() > 0)
+            goods.setPicture(suningGoods.getCommodityInfo().getPictureUrl().get(0).getPicUrl());
+
+        String commodityPrice = suningGoods.getCommodityInfo().getCommodityPrice();
+        if (StringUtil.isNullOrEmpty(commodityPrice)) {
+            commodityPrice = suningGoods.getCommodityInfo().getSnPrice();
+        }
+        goods.setPrice(new BigDecimal(commodityPrice));
+        goods.setShopId(Long.parseLong(suningGoods.getCommodityInfo().getSupplierCode()));
+        goods.setShopName(suningGoods.getCommodityInfo().getSupplierName());
+        goods.setShopType("鑻忓畞");
+        goods.setState(0);
+        goods.setTitle(suningGoods.getCommodityInfo().getCommodityName());
+        return goods;
+    }
+
+
+    public static CommonOrderGoods create(DYGoodsDetail dyGoods) {
+        CommonOrderGoods goods = new CommonOrderGoods();
+        goods.setGoodsId(dyGoods.getProduct_id() + "");
+        goods.setCreateTime(new Date());
+        goods.setGoodsType(Constant.SOURCE_TYPE_DY);
+        goods.setPicture(dyGoods.getCover());
+        goods.setPrice(new BigDecimal(dyGoods.getPrice()).divide(new BigDecimal(100), 2, RoundingMode.FLOOR));
+        goods.setShopId((long) dyGoods.getShop_id());
+        goods.setShopName(dyGoods.getShop_name());
+        goods.setShopType("鎶栭煶");
+        goods.setState(0);
+        goods.setTitle(dyGoods.getTitle());
+        return goods;
+    }
+
+}

--
Gitblit v1.8.0