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 | 133 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 66 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 07fa012..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
@@ -157,7 +157,7 @@
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
moneyInfoVO.setMoneyType(1); // 榛樿鏄剧ず锛氳繑 楼6.6
-
+
BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());
moneyInfoVO.setFanliMoney("楼" + commission);
moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
@@ -188,10 +188,10 @@
if (!StringUtil.isNullOrEmpty(goods.getSellerName())) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(goods.getSellerName());
-
- if( goods.getSellerId() != null)
+
+ if (goods.getSellerId() != null)
shop.setId(goods.getSellerId().toString());
-
+
if (shopType == null || shopType == 0) {
shop.setUserType(10);
} else if (shopType == 1) {
@@ -199,22 +199,22 @@
} 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);
-// }
-
+
+ // 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;
}
@@ -258,11 +258,13 @@
TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();
moneyInfoVO.setFanliMoney("楼" + taoBaoHongBaoInfo.getHongbao());
moneyInfoVO.setShareMoney("楼" + taoBaoHongBaoInfo.getHongbao());
- moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao().add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
+ moneyInfoVO.setMaxMoney("楼" + taoBaoHongBaoInfo.getHongbao()
+ .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));
} else {
BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());
moneyInfoVO.setFanliMoney("楼" + commission);
- moneyInfoVO.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
+ moneyInfoVO
+ .setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));
}
goodsInfo.setMoneyInfo(moneyInfoVO);
@@ -289,15 +291,15 @@
// 搴楅摵淇℃伅
String shopTitle = goods.getShopTitle();
-
+
if (!StringUtil.isNullOrEmpty(shopTitle)) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(shopTitle);
-
+
Long sellerId = goods.getSellerId();
- if(sellerId != null)
+ if (sellerId != null)
shop.setId(goods.getSellerId().toString());
-
+
if (shopType != null && shopType == 1) {
shop.setUserType(11);
} else {
@@ -306,18 +308,18 @@
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);
-// }
-
+ // 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;
}
@@ -424,16 +426,16 @@
if (!StringUtil.isNullOrEmpty(goods.getShopTitle())) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(goods.getShopTitle());
-
+
if (goods.getSellerId() != null)
shop.setId(goods.getSellerId().toString());
-
+
if (shopType != null && shopType == 1) {
shop.setUserType(11);
} else {
shop.setUserType(10);
}
-
+
goodsInfo.setShopInfo(shop);
}
@@ -441,18 +443,18 @@
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);
-// }
-
+ 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;
}
@@ -508,7 +510,7 @@
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();
// 璁＄畻鍒稿悗浠�
@@ -572,7 +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 {
@@ -586,7 +588,7 @@
if (isFreeShipping != null && isFreeShipping == 1) {
goodsInfo.setBaoyou(true);
}
-
+
return goodsInfo;
}
@@ -692,18 +694,17 @@
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);
-// }
+ // 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