From d99f45a1c358282ab0d4333232da25f03560778f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 五月 2020 18:49:31 +0800
Subject: [PATCH] 苏宁,唯品会接口修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 0401e47..02f587f 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
@@ -65,7 +65,7 @@
*/
public static GoodsDetailVO convertCommonGoods(CommonGoods goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
- goodsInfo.setGoodsId(goods.getGoodsId());
+ goodsInfo.setGoodsId(goods.getGoodsId() + "");
goodsInfo.setTitle(goods.getTitle());
Integer shopType = goods.getShopType();
@@ -136,9 +136,18 @@
goodsInfo.setSalesType(4); // 鎬婚攢閲�
goodsInfo.setPriceName("鎷煎洟浠�");
goodsInfo.setBaoyou(true);
+ } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(SuningUtil.getFullSupplierCode(goods.getSellerId() + ""),
+ goods.getGoodsId() + ""));
} else {
goodsInfo.setSalesType(1); // 鏈堥攢閲�
goodsInfo.setBaoyou(true);
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_VIP) {
+ goodsInfo.setDiscount(goods.getCouponInfo());
+ goodsInfo.setPriceName("鎶樺悗浠�");
+ goodsInfo.setCouponPrice(goods.getCouponStartPrice());
}
goodsInfo.setGoodsType(goodsType);
@@ -225,6 +234,10 @@
goodsInfo.setShopInfo(shop);
}
+ if (goodsType == Constant.SOURCE_TYPE_VIP) {
+ goodsInfo.setShopInfo(null);
+ }
+
// if (Constant.IS_TEST) {
// // 娣诲姞鏍囩
// List<ClientTextStyleVO> labels = goodsInfo.getLabels();
@@ -254,7 +267,7 @@
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- goodsInfo.setGoodsId(goods.getAuctionId());
+ goodsInfo.setGoodsId(goods.getAuctionId() + "");
goodsInfo.setTitle(goods.getTitle());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setZkPrice(goods.getZkPrice());
@@ -367,7 +380,7 @@
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- goodsInfo.setGoodsId(goods.getAuctionId());
+ goodsInfo.setGoodsId(goods.getAuctionId() + "");
goodsInfo.setTitle(goods.getTitle());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setZkPrice(goods.getZkPrice());
@@ -590,7 +603,7 @@
public static GoodsDetailVO convertJDGoods(JDGoods goods, ConfigParamsDTO params) {
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_JD);
- goodsInfo.setGoodsId(goods.getSkuId());
+ goodsInfo.setGoodsId(goods.getSkuId() + "");
goodsInfo.setTitle(goods.getSkuName());
goodsInfo.setSalesType(1); // 榛樿鏈堥攢閲�
goodsInfo.setPicUrl(goods.getPicUrl());
@@ -746,7 +759,7 @@
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_PDD);
- goodsInfo.setGoodsId(goods.getGoodsId());
+ goodsInfo.setGoodsId(goods.getGoodsId() + "");
goodsInfo.setTitle(goods.getGoodsName());
goodsInfo.setSalesType(4); // 鎬婚攢閲�
goodsInfo.setPriceName("鎷煎洟浠�");
@@ -879,12 +892,13 @@
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_VIP);
- goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()));
+ goodsInfo.setGoodsId(Long.parseLong(goods.getGoodsId()) + "");
goodsInfo.setTitle(goods.getGoodsName());
goodsInfo.setSalesType(5); // 鏃犻攢閲�
- goodsInfo.setPriceName("鎷煎洟浠�");
+ goodsInfo.setPriceName("鍘熶环");
goodsInfo.setPicUrl(goods.getGoodsThumbUrl()); // 缂╃暐鍥�
- goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getVipPrice())));
+ goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getMarketPrice())));
+ goodsInfo.setCouponPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getVipPrice())));
goodsInfo.setShopType(CommonGoods.SHOP_TYPE_VIP);
goodsInfo.setImgList(goods.getGoodsDetailPictures());
@@ -936,7 +950,7 @@
// 搴楅摵淇℃伅
String mallName = goods.getBrandName();
- if (!StringUtil.isMobile(mallName)) {
+ if (!StringUtil.isNullOrEmpty(mallName)) {
ShopInfoVO shop = new ShopInfoVO();
shop.setShopName(mallName);
if (goods.getBrandId() != null) {
@@ -946,6 +960,10 @@
goodsInfo.setShopInfo(shop);
}
+ // 鎶樻墸淇℃伅
+ goodsInfo.setDiscount(MoneyBigDecimalUtil
+ .getWithNoZera(MoneyBigDecimalUtil.mul(new BigDecimal(goods.getDiscount()), new BigDecimal(10))) + "鎶�");
+ goodsInfo.setShopInfo(null);
return goodsInfo;
}
@@ -953,9 +971,10 @@
GoodsDetailVO goodsInfo = new GoodsDetailVO();
goodsInfo.setBaoyou(true);
goodsInfo.setGoodsType(Constant.SOURCE_TYPE_SUNING);
- goodsInfo.setGoodsId(Long.parseLong(goods.getCommodityInfo().getCommodityCode()));
+ goodsInfo.setGoodsId(SuningUtil.getConcatGoodsIId(goods.getCommodityInfo().getSupplierCode(),
+ goods.getCommodityInfo().getCommodityCode()));
goodsInfo.setTitle(goods.getCommodityInfo().getCommodityName());
- goodsInfo.setSalesType(5); // 鏃犻攢閲�
+ goodsInfo.setSalesType(1); // 鏈堥攢
goodsInfo.setPriceName("鍘熶环");
if (goods.getCommodityInfo().getPictureUrl().size() > 0)
goodsInfo.setPicUrl(goods.getCommodityInfo().getPictureUrl().get(0).getPicUrl()); // 缂╃暐鍥�
@@ -970,7 +989,17 @@
goodsInfo.setImgList(imgList);
goodsInfo.setState(0);
- goodsInfo.setSalesCount(goods.getCommodityInfo().getMonthSales());
+
+ String salesCountMidea = "";
+ Integer count = Integer.parseInt(goods.getCommodityInfo().getMonthSales());
+ if (count < 10000) {
+ salesCountMidea = count + "";
+ } else {
+ double sales = count;
+ salesCountMidea = String.format("%.1f", sales / 10000);
+ salesCountMidea = salesCountMidea + "涓�";
+ }
+ goodsInfo.setSalesCount(salesCountMidea);
// 鍒镐俊鎭�
if (goods.getCouponInfo() != null && !StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl())) {// 鏈夊埜
@@ -994,6 +1023,11 @@
goodsInfo.setHasCoupon(true);
goodsInfo.setCouponInfo(coupon);
+
+ if (goodsInfo.getZkPrice().compareTo(coupon.getStartFee()) >= 0) {
+ goodsInfo.setCouponPrice(goodsInfo.getZkPrice().subtract(coupon.getAmount()));
+ }
+
} else {
goodsInfo.setHasCoupon(false);
}
--
Gitblit v1.8.0