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 | 169 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 121 insertions(+), 48 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 8d495de..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,6 +9,7 @@
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;
@@ -54,8 +55,7 @@
* 杩斿埄姣斾緥
* @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());
@@ -157,8 +157,11 @@
// 璧勯噾淇℃伅
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);
// 鍒镐俊鎭�
@@ -181,16 +184,37 @@
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;
}
@@ -204,8 +228,7 @@
* 杩斿埄姣斾緥
* @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);
@@ -235,9 +258,14 @@
TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
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);
@@ -263,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;
}
@@ -284,8 +333,7 @@
* 杩斿埄姣斾緥
* @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);
@@ -338,8 +386,10 @@
// 璧勯噾淇℃伅
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);
// 鍒镐俊鎭�
@@ -365,7 +415,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);
@@ -373,15 +423,36 @@
}
// 搴楅摵淇℃伅
- 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, pid, fanLiRate, shareRate);
+ 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;
@@ -391,26 +462,10 @@
BigDecimal fanLiRate, BigDecimal shareRate) {
if (goodsInfo != null && goods != null) {
- // 璧勯噾淇℃伅
- MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
- moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
- moneyInfoVO.setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, fanLiRate));
- moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, shareRate));
- goodsInfo.setMoneyInfo(moneyInfoVO);
- // 璁剧疆鍒稿悗浠蜂负瀹氶噾浠锋牸
- if (goods.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
- goodsInfo.setCouponPrice(new BigDecimal(goods.getPresaleDeposit()));
- }
- goodsInfo.setZkPrice(new BigDecimal(goods.getPresaleDeposit()));
-
// 娣诲姞鏍囩
if (goodsInfo.getLabels() == null)
goodsInfo.setLabels(new ArrayList<>());
goodsInfo.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
- // 鍦ㄦ爣棰樻坊鍔犱紭鎯犱俊鎭�
- if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
- goodsInfo.setTitle(String.format("銆�%s銆�", goods.getPresaleDiscountFeeText()) + goodsInfo.getTitle());
- }
}
return goodsInfo;
}
@@ -425,7 +480,7 @@
* 杩斿埄姣斾緥
* @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());
@@ -449,11 +504,13 @@
// 璧勯噾淇℃伅
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();
// 璁＄畻鍒稿悗浠�
@@ -517,6 +574,7 @@
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(shopInfo.getShopName());
shop.setId(shopInfo.getShopId().toString());
+
if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
shop.setUserType(20);
} else {
@@ -530,6 +588,7 @@
if (isFreeShipping != null && isFreeShipping == 1) {
goodsInfo.setBaoyou(true);
}
+
return goodsInfo;
}
@@ -543,7 +602,7 @@
* 杩斿埄姣斾緥
* @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);
@@ -578,8 +637,10 @@
// 璧勯噾淇℃伅
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();
@@ -629,9 +690,21 @@
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