From a1be6075c6b1365a7abc66bf559d6058039248ab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 五月 2021 18:13:29 +0800
Subject: [PATCH] 淘礼金兼容
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOLijinFactory.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 fb99e61..affa3e9 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
@@ -1,7 +1,7 @@
package com.yeshi.fanli.util.factory.goods;
import com.yeshi.common.vo.ClientTextStyleVO;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.jd.JDPingouInfo;
import com.yeshi.fanli.dto.jd.JDShopInfo;
@@ -22,9 +22,9 @@
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.MoneyInfoVO;
import com.yeshi.fanli.vo.goods.ShopInfoVO;
-import com.yeshi.fanli.vo.goods.lijin.GoodsDetailVO;
-import com.yeshi.fanli.vo.goods.lijin.GoodsDetailVO.GoodsInfoVO;
-import com.yeshi.fanli.vo.goods.lijin.GoodsDetailVO.GoodsRightsVO;
+import com.yeshi.fanli.lijin.vo.GoodsDetailVO;
+import com.yeshi.fanli.lijin.vo.GoodsDetailVO.GoodsInfoVO;
+import com.yeshi.fanli.lijin.vo.GoodsDetailVO.GoodsRightsVO;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import org.yeshi.utils.MoneyBigDecimalUtil;
import org.yeshi.utils.TimeUtil;
@@ -41,7 +41,7 @@
public class GoodsDetailVOLijinFactory {
- public static GoodsInfoVO convertTaoBao(TaoBaoGoodsBrief goods, ConfigParamsDTO params) {
+ public static GoodsInfoVO convertTaoBao(TaoBaoGoodsBrief goods, GoodsMoneyConfigParamsDTO params) {
GoodsInfoVO goodsInfo = new GoodsInfoVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
goodsInfo.setGoodsId(goods.getAuctionId() + "");
@@ -51,7 +51,7 @@
String provcity = goods.getProvcity();
if (!StringUtil.isNullOrEmpty(provcity)) {
String[] arr = provcity.split("\\s+");
- goodsInfo.setAddress(arr[arr.length - 1]);
+ goodsInfo.setAddress(StringUtil.concat(Arrays.asList(arr),"路"));
}
List<String> imgList = goods.getImgList();
@@ -81,6 +81,7 @@
}
goodsInfo.setZkPrice(getMoneyDesc(goods.getZkPrice()));
+ goodsInfo.setCouponPrice(TaoBaoUtil.getCouponPrice(goods));
//-----------璧勯噾淇℃伅--------------
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
@@ -89,7 +90,7 @@
boolean isSpecialGoods = TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType());
BigDecimal buyCommission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate(), !isSpecialGoods);
moneyInfoVO.setFanliMoney("楼" + buyCommission);
- moneyInfoVO.setFinalMoney(getMoneyDesc(TaoBaoUtil.getCouponPrice(goods).subtract(buyCommission)));
+ moneyInfoVO.setFinalMoney(getMoneyDesc(goodsInfo.getCouponPrice().subtract(buyCommission)));
goodsInfo.setMoneyInfo(moneyInfoVO);
// moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate(), true));
@@ -117,6 +118,7 @@
TaoBaoCouponUtil.getCoupleUrl(goods.getCouponActivityId(), null, goods.getAuctionId() + ""));
coupon.setStartFee(goods.getCouponStartFee());
coupon.setShopCoupon(goods.isShopCoupon());
+ goodsInfo.setTempCoupon(coupon);
couponInfoVOList.add(coupon);
goodsInfo.setCouponInfoList(couponInfoVOList);
@@ -216,7 +218,7 @@
}
- public static GoodsInfoVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {
+ public static GoodsInfoVO convertJDGoods(JDGoods goods, GoodsMoneyConfigParamsDTO params) {
GoodsInfoVO goodsInfo = new GoodsInfoVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);
goodsInfo.setGoodsId(goods.getSkuId() + "");
@@ -244,6 +246,8 @@
zkPrice = pinGouInfo.getPingouPrice();
}
goodsInfo.setZkPrice(getMoneyDesc(zkPrice));
+
+ goodsInfo.setCouponPrice(JDUtil.getCouponPrice(goods));
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
@@ -330,7 +334,7 @@
}
- public static GoodsInfoVO convertPDDGoods(PDDGoodsDetail goods, ConfigParamsDTO params) {
+ public static GoodsInfoVO convertPDDGoods(PDDGoodsDetail goods, GoodsMoneyConfigParamsDTO params) {
boolean bijia = false;
@@ -371,6 +375,7 @@
BigDecimal zkPrice = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)).setScale(2);
goodsInfo.setZkPrice(getMoneyDesc(zkPrice));
+ goodsInfo.setCouponPrice(PinDuoDuoUtil.getCouponPrice(goods));
Boolean hasCoupon = goods.getHasCoupon();
if (hasCoupon != null && hasCoupon) {
BigDecimal hundred = new BigDecimal(100);
@@ -425,7 +430,7 @@
return fillFanliPrice(fillRights(goodsInfo), bijia);
}
- public static GoodsInfoVO convertVIPGoods(VIPGoodsInfo goods, ConfigParamsDTO params) {
+ public static GoodsInfoVO convertVIPGoods(VIPGoodsInfo goods, GoodsMoneyConfigParamsDTO params) {
GoodsInfoVO goodsInfo = new GoodsInfoVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_VIP);
goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()) + "");
@@ -444,6 +449,7 @@
goodsInfo.setSalesCount("");
goodsInfo.setZkPrice(getMoneyDesc(new BigDecimal(goods.getVipPrice())));
+ goodsInfo.setCouponPrice(new BigDecimal(goods.getVipPrice()));
// 璧勯噾淇℃伅
MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
@@ -475,7 +481,7 @@
return fillFanliPrice(fillRights(goodsInfo), false);
}
- public static GoodsInfoVO convertSuningGoods(SuningGoodsInfo goods, ConfigParamsDTO params) {
+ public static GoodsInfoVO convertSuningGoods(SuningGoodsInfo goods, GoodsMoneyConfigParamsDTO params) {
GoodsInfoVO goodsInfo = new GoodsInfoVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_SUNING);
goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(goods.getCommodityInfo().getSupplierCode(),
@@ -487,7 +493,7 @@
zkPrice = goods.getCommodityInfo().getSnPrice();
}
goodsInfo.setZkPrice(getMoneyDesc(new BigDecimal(zkPrice)));
-
+ goodsInfo.setCouponPrice(SuningUtil.getCouponPrice(goods));
goodsInfo.setShopType(CommonGoods.SHOP_TYPE_SUNING);
--
Gitblit v1.8.0