From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 366 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 302 insertions(+), 64 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 78155da..c519bd8 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
@@ -4,11 +4,16 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
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;
@@ -24,7 +29,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -47,13 +54,14 @@
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @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());
@@ -87,12 +95,12 @@
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();
@@ -104,25 +112,24 @@
textStyleVO.setContent("浜笢鑷惀");
textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
}
// 鎷煎洟浠�
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("#FF9600");
+ textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
} else {
goodsInfo.setPriceName("浜笢浠�");
}
+ goodsInfo.setLabels(labels);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
goodsInfo.setSalesType(4); // 鎬婚攢閲�
goodsInfo.setPriceName("鎷煎洟浠�");
@@ -134,7 +141,12 @@
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) {
@@ -151,12 +163,21 @@
// 璧勯噾淇℃伅
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);
+
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ else
+ moneyInfoVO.setMaxMoney("楼" + CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate()));
+
+ 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) {
@@ -175,29 +196,51 @@
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;
}
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @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);
@@ -209,6 +252,7 @@
goodsInfo.setState(goods.getState() == null ? 0 : goods.getState());
goodsInfo.setSalesCount(goods.getSalesCount());
goodsInfo.setPicUrl(goods.getPictUrl());
+ goodsInfo.setDescription(goods.getDescription());
Integer shopType = goods.getUserType();
if (shopType != null && shopType == 1) {
@@ -227,9 +271,20 @@
TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
moneyInfoVO.setFanliMoney("楼" + taoBaoHongBaoInfo.getHongbao());
moneyInfoVO.setShareMoney("楼" + taoBaoHongBaoInfo.getHongbao());
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
+ .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
+ else
+ moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));
} else {
- moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));
+ BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO.setMaxMoney(
+ "楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ else
+ moneyInfoVO.setMaxMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
}
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -255,13 +310,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;
}
@@ -269,13 +345,14 @@
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @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);
@@ -283,6 +360,13 @@
goodsInfo.setTitle(goods.getTitle());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setZkPrice(goods.getZkPrice());
+ goodsInfo.setDescription(goods.getDescription());
+
+ 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) {
@@ -302,6 +386,8 @@
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 {
@@ -320,8 +406,25 @@
// 璧勯噾淇℃伅
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);
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ else {// 鍙湁鏈塚IP鍚庣殑鐗堟湰鎵嶄細鏄剧ず杩斿埄姣�
+
+ BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);
+ BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+
+ BigDecimal maxCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate());
+ BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
+ moneyInfoVO.setMaxMoney("楼" + maxCommission);
+ }
+ moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
// 鍒镐俊鎭�
@@ -347,7 +450,7 @@
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);
@@ -355,25 +458,109 @@
}
// 搴楅摵淇℃伅
- 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;
+ }
+
+ private static CouponInfoVO convertJDCouponInfo(JDCouponInfo couponInfo) {
+ CouponInfoVO coupon = new CouponInfoVO();
+ coupon.setAmount(couponInfo.getDiscount());
+ coupon.setLink(couponInfo.getLink());
+ coupon.setStartFee(couponInfo.getQuota());
+
+ if (couponInfo.getGetStartTime() != null) {
+ coupon.setStartTime(TimeUtil.getGernalTime(couponInfo.getGetStartTime(), "yyyy.MM.dd"));
+ }
+
+ if (couponInfo.getGetEndTime() != null) {
+ coupon.setEndTime(TimeUtil.getGernalTime(couponInfo.getGetEndTime(), "yyyy.MM.dd"));
+ }
+
+ return coupon;
+ }
+
+ private static List<CouponInfoVO> filterCouponInfo(List<CouponInfoVO> couponList) {
+ if (couponList == null)
+ return null;
+ long currentTime = System.currentTimeMillis();
+ Set<String> sets = new HashSet<>();
+ // 杩囨护鎺夎繃鏈熷埜
+ for (int i = 0; i < couponList.size(); i++) {
+ if (couponList.get(i).getStartTime() != null && couponList.get(i).getEndTime() != null) {
+ long startTime = TimeUtil.convertToTimeTemp(couponList.get(i).getStartTime(), "yyyy.MM.dd");
+ long endTime = TimeUtil.convertToTimeTemp(couponList.get(i).getEndTime(), "yyyy.MM.dd")
+ + 1000 * 60 * 60 * 24L;
+ if (currentTime < startTime || currentTime >= endTime) {
+ couponList.remove(i--);
+ continue;
+ }
+ }
+ // 杩囨护鎺夐潰鍊肩浉鍚屼笌璧峰閲戦鐩稿悓鐨�
+ String key = couponList.get(i).getStartFee() + "-" + couponList.get(i).getAmount();
+ if (!sets.contains(key))
+ sets.add(key);
+ else {
+ couponList.remove(i--);
+ continue;
+ }
+ }
+ return couponList;
+ }
+
/**
* 娣樺疂鍟嗗搧缁勭粐
*
- * @param goods 娣樺疂鍟嗗搧
+ * @param goods
+ * 娣樺疂鍟嗗搧
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertJDGoods(JDGoods goods, 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());
@@ -394,15 +581,28 @@
}
goodsInfo.setSalesCount(salesCountMidea);
-
// 璧勯噾淇℃伅
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);
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ else {
+ BigDecimal price = JDUtil.getQuanPrice(goods);
+ BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+
+ BigDecimal maxCommission = JDUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+ BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
+ moneyInfoVO.setMaxMoney("楼" + maxCommission);
+ }
+ 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();
// 璁＄畻鍒稿悗浠�
@@ -413,7 +613,7 @@
coupon.setAmount(discount);
coupon.setLink(couponInfo.getLink());
coupon.setStartFee(couponInfo.getQuota());
-
+
if (couponInfo.getGetStartTime() != null) {
coupon.setStartTime(sdf.format(new Date(couponInfo.getGetStartTime())));
}
@@ -421,16 +621,24 @@
if (couponInfo.getGetEndTime() != null) {
coupon.setEndTime(sdf.format(new Date(couponInfo.getGetEndTime())));
}
-
-
+
goodsInfo.setHasCoupon(true);
goodsInfo.setCouponInfo(coupon);
+ }
+
+ if (goods.getCouponInfoList() != null && goods.getCouponInfoList().size() > 0) {
+ List<CouponInfoVO> couponList = new ArrayList<>();
+ for (JDCouponInfo jdCoupon : goods.getCouponInfoList()) {
+ couponList.add(convertJDCouponInfo(jdCoupon));
+ }
+ goodsInfo.setCouponInfoList(filterCouponInfo(couponList));
}
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>();
}
@@ -438,37 +646,35 @@
textStyleVO.setContent("浜笢鑷惀");
textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
- goodsInfo.setShopType(21); // 浜笢鑷惀
} 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("#FF9600");
+ textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
} 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());
+
if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
shop.setUserType(20);
} else {
@@ -476,24 +682,27 @@
}
goodsInfo.setShopInfo(shop);
}
-
+
// 鏄惁鍖呴偖
Integer isFreeShipping = goods.getIsFreeShipping();
if (isFreeShipping != null && isFreeShipping == 1) {
goodsInfo.setBaoyou(true);
}
+
return goodsInfo;
}
/**
* 鎷煎澶氬晢鍝�
*
- * @param goods 鎷煎澶氬晢鍝�
+ * @param goods
+ * 鎷煎澶氬晢鍝�
* @param pid
- * @param fanLiRate 杩斿埄姣斾緥
+ * @param fanLiRate
+ * 杩斿埄姣斾緥
* @return
*/
- public static GoodsDetailVO convertPDDGoods(PDDGoodsDetail goods, 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);
@@ -528,9 +737,9 @@
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, fanLiRate));
- moneyInfoVO.setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, shareRate));
- goodsInfo.setMoneyInfo(moneyInfoVO);
+ BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
+ moneyInfoVO.setFanliMoney("楼" + commission);
+ moneyInfoVO.setShareMoney("楼" + commission);
Boolean hasCoupon = goods.getHasCoupon();
if (hasCoupon != null && hasCoupon) {
@@ -552,7 +761,7 @@
CouponInfoVO coupon = new CouponInfoVO();
coupon.setAmount(amount);
coupon.setStartFee(startFree);
-
+
if (goods.getCouponStartTime() != null) {
coupon.setStartTime(sdf.format(new Date(goods.getCouponStartTime() * 1000)));
}
@@ -560,7 +769,7 @@
if (goods.getCouponEndTime() != null) {
coupon.setEndTime(sdf.format(new Date(goods.getCouponEndTime() * 1000)));
}
-
+
if (goods.getCouponTotalQuantity() != null)
coupon.setTotalCount(Integer.parseInt(goods.getCouponTotalQuantity().toString()));
@@ -571,6 +780,22 @@
goodsInfo.setCouponInfo(coupon);
}
+ if (params.getMaxRewardRate() != null)
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ else {
+ BigDecimal price = goodsInfo.getCouponPrice() != null ? goodsInfo.getCouponPrice() : goodsInfo.getZkPrice();
+ BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
+
+ BigDecimal maxCommission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate());
+ BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
+ moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
+
+ moneyInfoVO.setMaxMoney("楼" + maxCommission);
+ }
+ goodsInfo.setMoneyInfo(moneyInfoVO);
+
// 搴楅摵淇℃伅
String mallName = goods.getMallName();
if (!StringUtil.isMobile(mallName)) {
@@ -579,10 +804,23 @@
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