From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java |   80 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 insertions(+), 0 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 a00e79f..af51f54 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,8 +1,17 @@
 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.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
 
 public class CommonOrderGoodsFactory {
 
@@ -24,4 +33,75 @@
 		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;
+	}
+
 }

--
Gitblit v1.8.0