From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 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 6c46314..b73c90b 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,8 +4,6 @@
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;
@@ -31,7 +29,6 @@
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;
@@ -167,13 +164,21 @@
BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());
moneyInfoVO.setFanliMoney("楼" + commission);
+ BigDecimal maxCommission = CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate());
if (params.getMaxRewardRate() != null)
moneyInfoVO
.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
else
- moneyInfoVO.setMaxMoney("楼" + CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate()));
+ moneyInfoVO.setMaxMoney("楼" + maxCommission);
moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));
+
+ moneyInfoVO.setRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),
+ CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
+
+ moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),
+ CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
+
goodsInfo.setMoneyInfo(moneyInfoVO);
// 鍒镐俊鎭�
@@ -252,6 +257,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) {
@@ -303,6 +309,7 @@
coupon.setStartTime(sdf.format(new Date(Long.parseLong(couponEffectiveStartTime))));
coupon.setLink(taoBaoQuanInfo.getCouponLink());
coupon.setStartFee(taoBaoQuanInfo.getCouponStartFee());
+ coupon.setShopCoupon(goods.isShopCoupon());
goodsInfo.setHasCoupon(true);
goodsInfo.setCouponInfo(coupon);
}
@@ -359,6 +366,7 @@
goodsInfo.setTitle(goods.getTitle());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setZkPrice(goods.getZkPrice());
+ goodsInfo.setDescription(goods.getDescription());
String provcity = goods.getProvcity();
if (!StringUtil.isNullOrEmpty(provcity)) {
@@ -406,7 +414,9 @@
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
-
+ BigDecimal baseCommisstion = null;
+ if (params.getBaseFanliRate() != null)
+ baseCommisstion = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getBaseFanliRate());
moneyInfoVO.setFanliMoney("楼" + commission);
if (params.getMaxRewardRate() != null)
moneyInfoVO
@@ -421,8 +431,18 @@
BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
moneyInfoVO.setMaxMoney("楼" + maxCommission);
+ if (baseCommisstion != null) {
+ String desc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ commission.subtract(baseCommisstion).setScale(2).toString());
+ String maxDesc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ maxCommission.subtract(baseCommisstion).setScale(2).toString());
+ moneyInfoVO.setCompositionInfo(desc);
+ moneyInfoVO.setMaxCompositionInfo(maxDesc);
+ }
}
+
moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
+
goodsInfo.setMoneyInfo(moneyInfoVO);
// 鍒镐俊鎭�
@@ -448,9 +468,13 @@
coupon.setStartTime(goods.getCouponEffectiveStartTime().replace("-", "."));
}
- coupon.setLink(TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + ""));
+ if (!StringUtil.isNullOrEmpty(goods.getCouponLink()))
+ coupon.setLink(goods.getCouponLink());
+ else
+ coupon.setLink(
+ TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + ""));
coupon.setStartFee(goods.getCouponStartFee());
-
+ coupon.setShopCoupon(goods.isShopCoupon());
goodsInfo.setHasCoupon(true);
goodsInfo.setCouponInfo(coupon);
}
@@ -584,6 +608,10 @@
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
moneyInfoVO.setFanliMoney("楼" + commission);
+ BigDecimal baseCommisstion = null;
+ if (params.getBaseFanliRate() != null)
+ baseCommisstion = JDUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());
+
if (params.getMaxRewardRate() != null)
moneyInfoVO
.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
@@ -596,6 +624,15 @@
BigDecimal maxRate = MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)), price);
moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
moneyInfoVO.setMaxMoney("楼" + maxCommission);
+
+ if (baseCommisstion != null) {
+ String desc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ commission.subtract(baseCommisstion).setScale(2).toString());
+ String maxDesc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ maxCommission.subtract(baseCommisstion).setScale(2).toString());
+ moneyInfoVO.setCompositionInfo(desc);
+ moneyInfoVO.setMaxCompositionInfo(maxDesc);
+ }
}
moneyInfoVO.setShareMoney("楼" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -778,6 +815,10 @@
goodsInfo.setCouponInfo(coupon);
}
+ BigDecimal baseCommisstion = null;
+ if (params.getBaseFanliRate() != null)
+ baseCommisstion = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getBaseFanliRate());
+
if (params.getMaxRewardRate() != null)
moneyInfoVO
.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
@@ -791,6 +832,15 @@
moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + maxRate + "%");
moneyInfoVO.setMaxMoney("楼" + maxCommission);
+
+ if (baseCommisstion != null) {
+ String desc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ commission.subtract(baseCommisstion).setScale(2).toString());
+ String maxDesc = String.format("浣ｉ噾楼 %s+骞冲彴琛ヨ创楼 %s", baseCommisstion.setScale(2).toString(),
+ maxCommission.subtract(baseCommisstion).setScale(2).toString());
+ moneyInfoVO.setCompositionInfo(desc);
+ moneyInfoVO.setMaxCompositionInfo(maxDesc);
+ }
}
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -820,5 +870,4 @@
return goodsInfo;
}
-
}
--
Gitblit v1.8.0