From aba5dee7a341ecb60fe02f088684aa982ac037f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 11 六月 2019 09:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 588914a..53156cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
@@ -64,7 +65,6 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoHttpUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -1698,6 +1698,32 @@
return taoBaoGoods;
}
+ public static TaoBaoGoodsBrief convert(DaTaoKeDetailV2 detail) {
+ TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
+ taoBaoGoods.setAuctionId(detail.getGoodsId());
+ taoBaoGoods.setBiz30day(detail.getMonthSales());
+ taoBaoGoods.setCouponAmount(detail.getCouponPrice());
+ taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
+ MoneyBigDecimalUtil.getWithNoZera(detail.getCouponPrice())));
+ if (detail.getCouponTotalNum() != null && detail.getCouponReceiveNum() != null)
+ taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
+ else
+ taoBaoGoods.setCouponLeftCount(0);
+ taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getCouponConditions()));
+ taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
+ taoBaoGoods.setPictUrl(detail.getMainPic());
+ taoBaoGoods.setPictUrlWhite(detail.getMainPic());
+ taoBaoGoods.setSellerId(detail.getSellerId());
+ taoBaoGoods.setShopTitle(detail.getShopName());
+ taoBaoGoods.setTitle(detail.getDtitle());
+ taoBaoGoods.setUserType(detail.getShopType());
+ taoBaoGoods.setZkPrice(detail.getOriginalPrice());
+ taoBaoGoods.setTkRate(detail.getCommissionRate());
+ taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+ taoBaoGoods.setState(0);
+ return taoBaoGoods;
+ }
+
/**
* 鑾峰彇娣樺疂鑱旂洘鐨勬巿鏉冮摼鎺�
*
--
Gitblit v1.8.0