From bc9d4bf3fddcb3107f8509159a250f7a5a5f8ae5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 六月 2021 17:13:01 +0800
Subject: [PATCH] 特价bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java
index affa3e9..ea6426d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java
@@ -11,6 +11,7 @@
import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -51,7 +52,7 @@
String provcity = goods.getProvcity();
if (!StringUtil.isNullOrEmpty(provcity)) {
String[] arr = provcity.split("\\s+");
- goodsInfo.setAddress(StringUtil.concat(Arrays.asList(arr),"路"));
+ goodsInfo.setAddress(StringUtil.concat(Arrays.asList(arr), "路"));
}
List<String> imgList = goods.getImgList();
@@ -157,7 +158,7 @@
goodsInfo.setLabels(labels);
}
- return fillFanliPrice(fillRights(goodsInfo), false);
+ return fillRights(fillFanliPrice(goodsInfo, false));
}
private static GoodsInfoVO loadYuShouInfo(GoodsInfoVO goodsInfo, TaoBaoGoodsBrief goods, String pid,
@@ -570,9 +571,10 @@
}
- private static GoodsInfoVO fillRights(GoodsInfoVO goodsInfoVO) {
+ public static GoodsInfoVO fillRights(GoodsInfoVO goodsInfoVO) {
+ List<GoodsRightsVO> rightsVOS = new ArrayList<>();
if (goodsInfoVO.getCouponInfoList() != null) {
- List<GoodsRightsVO> rightsVOS = new ArrayList<>();
+ //鍔犺浇鍒告潈鐩�
for (CouponInfoVO couponInfoVO : goodsInfoVO.getCouponInfoList()) {
String desc = "";
if (couponInfoVO.getStartFee() == null || couponInfoVO.getStartFee().compareTo(new BigDecimal(0)) <= 0) {
@@ -582,8 +584,14 @@
}
rightsVOS.add(new GoodsRightsVO(1, "楼" + MoneyBigDecimalUtil.getWithNoZera(couponInfoVO.getAmount()).toString(), desc));
}
- goodsInfoVO.setRights(rightsVOS);
}
+
+ //鍔犺浇绀奸噾鏉冪泭
+ if (!StringUtil.isNullOrEmpty(goodsInfoVO.getMoneyInfo().getHongBaoMoney())) {
+ rightsVOS.add(new GoodsRightsVO(2, goodsInfoVO.getMoneyInfo().getHongBaoMoney(), "鑷姩鍙戞斁"));
+ }
+ goodsInfoVO.setRights(rightsVOS);
+
return goodsInfoVO;
}
--
Gitblit v1.8.0