From dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 三月 2020 12:15:56 +0800
Subject: [PATCH] 大淘客商品过滤修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 81389cc..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;
@@ -178,7 +175,7 @@
moneyInfoVO.setRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)),
CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
-
+
moneyInfoVO.setMaxRateInfo("杩斿埄姣� " + MoneyBigDecimalUtil.div(maxCommission.multiply(new BigDecimal(100)),
CommonGoodsUtil.getAfterUseCouplePrice(goods)) + "%");
@@ -312,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);
}
@@ -470,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);
}
--
Gitblit v1.8.0