From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 458 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 331 insertions(+), 127 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 0689c9b..bab826d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -9,7 +9,11 @@
import org.yeshi.utils.taobao.TbImgUtil;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
+import com.yeshi.fanli.dto.jd.JDPingouInfo;
+import com.yeshi.fanli.dto.jd.JDShopInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
@@ -29,6 +33,9 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.MoneyInfoVO;
import com.yeshi.fanli.vo.goods.ShopInfoVO;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+
+import net.sf.json.JSONObject;
/**
* 鍟嗗搧鍔犲伐
@@ -41,42 +48,99 @@
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @param goods 娣樺疂鍟嗗搧
+ * @param goods
+ * 娣樺疂鍟嗗搧
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertCommonGoods(CommonGoods goods, String pid, BigDecimal fanLiRate,
- BigDecimal shareRate) {
+ public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setGoodsId(goods.getGoodsId());
goodsInfo.setTitle(goods.getTitle());
-
+
Integer shopType = goods.getShopType();
- if (shopType == null) {
+ if (shopType == null) {
goodsInfo.setShopType(10); // 娣樺疂
- } else if (shopType == 1) {
+ goodsInfo.setPriceName("娣樺疂浠�");
+ } else if (shopType == 1) {
goodsInfo.setShopType(10); // 娣樺疂
+ goodsInfo.setPriceName("娣樺疂浠�");
} else if (shopType == 2) {
goodsInfo.setShopType(11); // 澶╃尗
+ goodsInfo.setPriceName("澶╃尗浠�");
} else {
goodsInfo.setShopType(goods.getShopType());
}
-
+
Integer goodsType = goods.getGoodsType();
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
-
- if (goodsType == Constant.SOURCE_TYPE_PDD) {
+
+ GoodsOtherInfoDTO otherDTO = null;
+ String otherInfo = goods.getOtherInfo();
+ if (!StringUtil.isNullOrEmpty(otherInfo)) {
+ JSONObject json = JSONObject.fromObject(otherInfo);
+ otherDTO = (GoodsOtherInfoDTO) JSONObject.toBean(json, GoodsOtherInfoDTO.class);
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+ // 鏈堥攢閲�
+ goodsInfo.setSalesType(1);
+
+ Integer isFreeShipping = otherDTO.getIsFreeShipping();
+ if (isFreeShipping != null && isFreeShipping == 1) {
+ goodsInfo.setBaoyou(true);
+ }
+
+ List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ // 鑷惀
+ String owner = otherDTO.getOwner();
+ if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+ if (labels == null) {
+ labels = new ArrayList<ClientTextStyleVO>();
+ }
+ ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+ textStyleVO.setContent("浜笢鑷惀");
+ textStyleVO.setColor("#E42219");
+ labels.add(textStyleVO);
+ }
+ // 鎷煎洟浠�
+ JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
+ if (pinGouInfo != null) {
+ goods.setPrice(pinGouInfo.getPingouPrice());
+ goodsInfo.setPriceName("鎷艰喘浠�");
+
+ if (labels == null) {
+ labels = new ArrayList<ClientTextStyleVO>();
+ }
+ ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+ textStyleVO.setContent("鎷艰喘");
+ textStyleVO.setColor("#E42219");
+ labels.add(textStyleVO);
+ } else {
+ goodsInfo.setPriceName("浜笢浠�");
+ }
+ goodsInfo.setLabels(labels);
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
goodsInfo.setSalesType(4); // 鎬婚攢閲�
+ goodsInfo.setPriceName("鎷煎洟浠�");
+ goodsInfo.setBaoyou(true);
} else {
goodsInfo.setSalesType(1); // 鏈堥攢閲�
+ goodsInfo.setBaoyou(true);
}
-
+
goodsInfo.setGoodsType(goodsType);
goodsInfo.setZkPrice(goods.getPrice());
- goodsInfo.setState(goods.getState());
+ Integer state = goods.getState();
+ if (state == null) {
+ goodsInfo.setState(0);
+ } else {
+ goodsInfo.setState(goods.getState());
+ }
goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
@@ -89,17 +153,19 @@
} else {
goodsInfo.setPicUrl(goods.getPicture());
}
-
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney(CommonGoodsUtil.getCommissionInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, shareRate));
+
+ BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
// 鍒镐俊鎭�
- if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
+ if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
// 璁＄畻鍒稿悗浠�
BigDecimal sub = goods.getPrice().subtract(goods.getCouponStartPrice());
if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
@@ -118,16 +184,36 @@
goodsInfo.setCouponInfo(coupon);
}
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- // 搴楅摵淇℃伅
- if (!StringUtil.isNullOrEmpty(goods.getSellerName()) && goods.getSellerId() != null) {
- ShopInfoVO shop = new ShopInfoVO();
- shop.setShopName(goods.getSellerName());
+ // 搴楅摵淇℃伅
+ if (!StringUtil.isNullOrEmpty(goods.getSellerName())) {
+ ShopInfoVO shop = new ShopInfoVO();
+ shop.setShopName(goods.getSellerName());
+
+ if (goods.getSellerId() != null)
shop.setId(goods.getSellerId().toString());
- goodsInfo.setShopInfo(shop);
+
+ if (shopType == null || shopType == 0) {
+ shop.setUserType(10);
+ } else if (shopType == 1) {
+ shop.setUserType(11);
+ } else {
+ shop.setUserType(goods.getShopType());
}
+ goodsInfo.setShopInfo(shop);
}
+
+ // if (Constant.IS_TEST) {
+ // // 娣诲姞鏍囩
+ // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ // if (labels == null)
+ // labels = new ArrayList<>();
+ //
+ // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+ // goodsInfo.setLabels(labels);
+ // }
return goodsInfo;
}
@@ -135,14 +221,16 @@
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @param goods 娣樺疂鍟嗗搧
+ * @param goods
+ * 娣樺疂鍟嗗搧
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, BigDecimal fanLiRate,
- BigDecimal shareRate) {
+ public static GoodsDetailVO convertTaoBaoGoodsBriefExtra(TaoBaoGoodsBriefExtra goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
+ goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
goodsInfo.setGoodsId(goods.getAuctionId());
goodsInfo.setTitle(goods.getTitle());
@@ -154,23 +242,30 @@
goodsInfo.setPicUrl(goods.getPictUrl());
Integer shopType = goods.getUserType();
- if (shopType != null && shopType == 2) {
+ if (shopType != null && shopType == 1) {
goodsInfo.setShopType(11); // 澶╃尗
+ goodsInfo.setPriceName("澶╃尗浠�");
} else {
goodsInfo.setShopType(10); // 娣樺疂
+ goodsInfo.setPriceName("娣樺疂浠�");
}
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
-
+
if (goods.getTkRate() == null) {
TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
- moneyInfoVO.setFanliMoney("楼"+ taoBaoHongBaoInfo.getHongbao());
- moneyInfoVO.setShareMoney("楼"+ taoBaoHongBaoInfo.getHongbao());
+ moneyInfoVO.setFanliMoney("楼" + taoBaoHongBaoInfo.getHongbao());
+ moneyInfoVO.setShareMoney("楼" + taoBaoHongBaoInfo.getHongbao());
+ moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
+ .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
} else {
- moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));
+ BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
}
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -196,13 +291,34 @@
// 搴楅摵淇℃伅
String shopTitle = goods.getShopTitle();
- Long sellerId = goods.getSellerId();
- if (!StringUtil.isNullOrEmpty(shopTitle) && sellerId != null) {
+
+ if (!StringUtil.isNullOrEmpty(shopTitle)) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(shopTitle);
- shop.setId(goods.getSellerId().toString());
+
+ Long sellerId = goods.getSellerId();
+ if (sellerId != null)
+ shop.setId(goods.getSellerId().toString());
+
+ if (shopType != null && shopType == 1) {
+ shop.setUserType(11);
+ } else {
+ shop.setUserType(10);
+ }
goodsInfo.setShopInfo(shop);
}
+
+ // if (Constant.IS_TEST) {
+ // // 娣诲姞鏍囩
+ // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ // if (labels == null)
+ // labels = new ArrayList<>();
+ //
+ // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+ // goodsInfo.setLabels(labels);
+ // }
return goodsInfo;
}
@@ -210,20 +326,28 @@
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @param goods 娣樺疂鍟嗗搧
+ * @param goods
+ * 娣樺疂鍟嗗搧
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, String pid, BigDecimal fanLiRate,
- BigDecimal shareRate) {
+ public static GoodsDetailVO convertTaoBao(TaoBaoGoodsBrief goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
+ goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
goodsInfo.setGoodsId(goods.getAuctionId());
goodsInfo.setTitle(goods.getTitle());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setZkPrice(goods.getZkPrice());
-
+
+ String provcity = goods.getProvcity();
+ if (!StringUtil.isNullOrEmpty(provcity)) {
+ String[] arr = provcity.split("\\s+");
+ goodsInfo.setProvcity(arr[arr.length - 1]);
+ }
+
List<String> imgList = goods.getImgList();
if (imgList != null) {
goodsInfo.setImgList(imgList);
@@ -232,17 +356,18 @@
imgList.add(goods.getPictUrl());
goodsInfo.setImgList(imgList);
}
-
+
Integer state = goods.getState();
if (state == null) {
goodsInfo.setState(0);
} else {
goodsInfo.setState(state);
}
-
-
+
goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getBiz30day()));
+ // 鐧藉簳鍥惧彲鑳芥湁閿欒
+ // https://img.alicdn.com/bao/uploaded/TB1LVqmVZbpK1RjSZFyXXX_qFXa.png
if (!StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrlWhite()));
} else {
@@ -250,17 +375,21 @@
}
Integer shopType = goods.getUserType();
- if (shopType != null && shopType == 2) {
+ if (shopType != null && shopType == 1) {
goodsInfo.setShopType(11); // 澶╃尗
+ goodsInfo.setPriceName("澶╃尗浠�");
} else {
goodsInfo.setShopType(10); // 娣樺疂
+ goodsInfo.setPriceName("娣樺疂浠�");
}
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));
+ BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
// 鍒镐俊鎭�
@@ -281,12 +410,12 @@
if (goods.getCouponEffectiveEndTime() != null) {
coupon.setEndTime(goods.getCouponEffectiveEndTime().replace("-", "."));
}
-
+
if (goods.getCouponEffectiveStartTime() != null) {
coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));
- }
-
- coupon.setLink(TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), pid, goods.getAuctionId() + ""));
+ }
+
+ coupon.setLink(TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + ""));
coupon.setStartFee(goods.getCouponStartFee());
goodsInfo.setHasCoupon(true);
@@ -294,32 +423,70 @@
}
// 搴楅摵淇℃伅
- if (!StringUtil.isNullOrEmpty(goods.getShopTitle()) && goods.getSellerId() != null) {
+ if (!StringUtil.isNullOrEmpty(goods.getShopTitle())) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(goods.getShopTitle());
- shop.setId(goods.getSellerId().toString());
+
+ if (goods.getSellerId() != null)
+ shop.setId(goods.getSellerId().toString());
+
+ if (shopType != null && shopType == 1) {
+ shop.setUserType(11);
+ } else {
+ shop.setUserType(10);
+ }
+
goodsInfo.setShopInfo(shop);
}
+ if (TaoBaoUtil.isYUShou(goods)) {// 棰勫敭鍟嗗搧
+ goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());
+ }
+
+ if (Constant.IS_TEST) {
+ // 娣诲姞鏍囩
+ List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ if (labels == null)
+ labels = new ArrayList<>();
+
+ labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+ labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+ goodsInfo.setLabels(labels);
+ }
+
+ return goodsInfo;
+ }
+
+ private static GoodsDetailVO loadYuShouInfo(GoodsDetailVO goodsInfo, TaoBaoGoodsBrief goods, String pid,
+ BigDecimal fanLiRate, BigDecimal shareRate) {
+
+ if (goodsInfo != null && goods != null) {
+ // 娣诲姞鏍囩
+ if (goodsInfo.getLabels() == null)
+ goodsInfo.setLabels(new ArrayList<>());
+ goodsInfo.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ }
return goodsInfo;
}
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @param goods 娣樺疂鍟嗗搧
+ * @param goods
+ * 娣樺疂鍟嗗搧
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertJDGoods(JDGoods goods, String pid, BigDecimal fanLiRate, BigDecimal shareRate) {
+ public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);
goodsInfo.setGoodsId(goods.getSkuId());
goodsInfo.setTitle(goods.getSkuName());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setPicUrl(goods.getPicUrl());
- goodsInfo.setZkPrice(goods.getPrice());
goodsInfo.setImgList(goods.getImageList());
goodsInfo.setState(0);
@@ -334,67 +501,93 @@
}
goodsInfo.setSalesCount(salesCountMidea);
- String owner = goods.getOwner();
- if (StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
- goodsInfo.setShopType(21); // 浜笢鑷惀
- } else {
- goodsInfo.setShopType(20); // 浜笢
- }
-
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, fanLiRate));
- moneyInfoVO.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, shareRate));
+ BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
- JDCouponInfo couponInfo = goods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);
if (couponInfo != null) {
BigDecimal discount = couponInfo.getDiscount();
- BigDecimal price = goods.getPrice();
// 璁＄畻鍒稿悗浠�
- BigDecimal sub = price.subtract(couponInfo.getQuota());
- if (sub.compareTo(BigDecimal.valueOf(0)) >= 0) {
- BigDecimal quanPrice = MoneyBigDecimalUtil.sub(price, discount);
- goodsInfo.setCouponPrice(quanPrice);
- } else {
- goodsInfo.setCouponPrice(price);
- }
+ goodsInfo.setCouponPrice(JDUtil.getQuanPrice(goods));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
CouponInfoVO coupon = new CouponInfoVO();
coupon.setAmount(discount);
+ coupon.setLink(couponInfo.getLink());
+ coupon.setStartFee(couponInfo.getQuota());
+
if (couponInfo.getGetStartTime() != null) {
coupon.setStartTime(sdf.format(new Date(couponInfo.getGetStartTime())));
- } else {
- coupon.setStartTime(sdf.format(new Date()));
}
if (couponInfo.getGetEndTime() != null) {
coupon.setEndTime(sdf.format(new Date(couponInfo.getGetEndTime())));
- } else {
- coupon.setEndTime(sdf.format(new Date()));
}
-
- // TODO
-// coupon.setLeftCount(leftCount);
-// coupon.setTotalCount(totalCount);
-
- coupon.setLink(couponInfo.getLink());
- coupon.setStartFee(couponInfo.getQuota());
goodsInfo.setHasCoupon(true);
goodsInfo.setCouponInfo(coupon);
}
+ List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ // 浜笢鑷惀鏍囩
+ String owner = goods.getOwner();
+ if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+ goodsInfo.setShopType(21); // 浜笢鑷惀
+ if (labels == null) {
+ labels = new ArrayList<ClientTextStyleVO>();
+ }
+ ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+ textStyleVO.setContent("浜笢鑷惀");
+ textStyleVO.setColor("#E42219");
+ labels.add(textStyleVO);
+ } else {
+ goodsInfo.setShopType(20); // 浜笢
+ }
+
+ JDPingouInfo pinGouInfo = goods.getPinGouInfo();
+ if (pinGouInfo != null) {
+ goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());
+ goodsInfo.setPriceName("鎷艰喘浠�");
+
+ if (labels == null) {
+ labels = new ArrayList<ClientTextStyleVO>();
+ }
+ ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
+ textStyleVO.setContent("鎷艰喘");
+ textStyleVO.setColor("#E42219");
+ labels.add(textStyleVO);
+ } else {
+ goodsInfo.setZkPrice(goods.getPrice());
+ goodsInfo.setPriceName("浜笢浠�");
+ }
+ goodsInfo.setLabels(labels);
+
// 搴楅摵淇℃伅
-// JDShopInfo shopInfo = goods.getShopInfo();
-// if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {
-// ShopInfoVO shop = new ShopInfoVO();
-// shop.setShopName(shopInfo.getShopName());
-// shop.setId(shopInfo.getShopId().toString());
-// goodsInfo.setShopInfo(shop);
-// }
+ JDShopInfo shopInfo = goods.getShopInfo();
+ if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {
+ ShopInfoVO shop = new ShopInfoVO();
+ shop.setShopName(shopInfo.getShopName());
+ shop.setId(shopInfo.getShopId().toString());
+
+ if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+ shop.setUserType(20);
+ } else {
+ shop.setUserType(21);
+ }
+ goodsInfo.setShopInfo(shop);
+ }
+
+ // 鏄惁鍖呴偖
+ Integer isFreeShipping = goods.getIsFreeShipping();
+ if (isFreeShipping != null && isFreeShipping == 1) {
+ goodsInfo.setBaoyou(true);
+ }
return goodsInfo;
}
@@ -402,20 +595,24 @@
/**
* 鎷煎澶氬晢鍝�
*
- * @param goods 鎷煎澶氬晢鍝�
+ * @param goods
+ * 鎷煎澶氬晢鍝�
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, String pid, BigDecimal fanLiRate,
- BigDecimal shareRate) {
+ public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
+ goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD);
goodsInfo.setGoodsId(goods.getGoodsId());
goodsInfo.setTitle(goods.getGoodsName());
goodsInfo.setSalesType(4); // 鎬婚攢閲�
- goodsInfo.setPicUrl(goods.getGoodsImageUrl());
- goodsInfo.setZkPrice(new BigDecimal(goods.getMinNormalPrice()));
+ goodsInfo.setPriceName("鎷煎洟浠�");
+ goodsInfo.setPicUrl(goods.getGoodsThumbnailUrl()); // 缂╃暐鍥�
+ goodsInfo.setZkPrice(
+ MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)).setScale(2));
goodsInfo.setShopType(30); // 鎷煎澶�
String[] goodsGalleryUrls = goods.getGoodsGalleryUrls();
@@ -431,32 +628,28 @@
}
// 鎬婚攢閲�
- String salesCountMidea = null;
- Long soldQuantity = goods.getSoldQuantity();
- if (soldQuantity == null)
- soldQuantity = 0L;
-
- if (soldQuantity < 10000) {
- salesCountMidea = soldQuantity + "";
- } else {
- double sales = soldQuantity;
- salesCountMidea = String.format("%.1f", sales / 10000);
- salesCountMidea = salesCountMidea + "涓�";
+ String salesTip = goods.getSalesTip();
+ if (StringUtil.isNullOrEmpty(salesTip)) {
+ salesTip = "0";
}
- goodsInfo.setSalesCount(salesCountMidea);
+ goodsInfo.setSalesCount(salesTip);
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, fanLiRate));
- moneyInfoVO.setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, shareRate));
+ BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO.setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
Boolean hasCoupon = goods.getHasCoupon();
if (hasCoupon != null && hasCoupon) {
- BigDecimal amount = new BigDecimal(goods.getCouponDiscount());
- BigDecimal price = new BigDecimal(goods.getMinNormalPrice());
- BigDecimal startFree = new BigDecimal(goods.getCouponMinOrderAmount());
+ BigDecimal hundred = new BigDecimal(100);
+ BigDecimal amount = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponDiscount()), hundred).setScale(2);
+ BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred).setScale(2);
+ BigDecimal startFree = MoneyBigDecimalUtil.div(new BigDecimal(goods.getCouponMinOrderAmount()), hundred)
+ .setScale(2);
// 璁＄畻鍒稿悗浠�
if (startFree.compareTo(price) <= 0) {
@@ -469,6 +662,8 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
CouponInfoVO coupon = new CouponInfoVO();
coupon.setAmount(amount);
+ coupon.setStartFee(startFree);
+
if (goods.getCouponStartTime() != null) {
coupon.setStartTime(sdf.format(new Date(goods.getCouponStartTime() * 1000)));
}
@@ -476,8 +671,6 @@
if (goods.getCouponEndTime() != null) {
coupon.setEndTime(sdf.format(new Date(goods.getCouponEndTime() * 1000)));
}
- coupon.setLink(null);
- coupon.setStartFee(startFree);
if (goods.getCouponTotalQuantity() != null)
coupon.setTotalCount(Integer.parseInt(goods.getCouponTotalQuantity().toString()));
@@ -490,17 +683,28 @@
}
// 搴楅摵淇℃伅
-// String mallName = goods.getMallName();
-// if (!StringUtil.isMobile(mallName)) {
-// ShopInfoVO shop = new ShopInfoVO();
-// shop.setShopName(mallName);
-//
-// if (goods.getMallId() != null) {
-// shop.setId(goods.getMallId().toString());
-// }
-// goodsInfo.setShopInfo(shop);
-// }
+ String mallName = goods.getMallName();
+ if (!StringUtil.isMobile(mallName)) {
+ ShopInfoVO shop = new ShopInfoVO();
+ shop.setShopName(mallName);
+ if (goods.getMallId() != null) {
+ shop.setId(goods.getMallId().toString());
+ }
+ shop.setUserType(30);
+ goodsInfo.setShopInfo(shop);
+ }
+ // if (Constant.IS_TEST) {
+ // // 娣诲姞鏍囩
+ // List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ // if (labels == null)
+ // labels = new ArrayList<>();
+ //
+ // labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+ // labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+ // goodsInfo.setLabels(labels);
+ // }
return goodsInfo;
}
--
Gitblit v1.8.0