From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 148 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 30 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 4d1109d..253f227 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;
@@ -62,9 +63,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
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;
@@ -704,6 +705,8 @@
tg.setReservePrice(tb.getReservePrice());
tg.setUserType(tb.getUserType());
tg.setShopTitle(tb.getShopTitle());
+ tg.setTkRate(tb.getTkRate());
+ tg.setSellerId(tb.getSellerId());
tg.setState(tb.getState()); // 鐘舵�侊細2018-12-03
if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
@@ -766,10 +769,13 @@
tg.setSalesType(1);
// 娴嬭瘯浣跨敤
// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
+ // if(Constant.IS_TEST)
+ // {
// List<ClientTextStyleVO> labels = new ArrayList<>();
// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
// tg.setLabels(labels);
+ // }
return tg;
}
@@ -1684,7 +1690,8 @@
MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));
taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());
taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));
- taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus());
+ if (detail.getQuanReceive() != null)
+ taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive());
taoBaoGoods.setPictUrl(detail.getPic());
taoBaoGoods.setPictUrlWhite(detail.getPic());
taoBaoGoods.setSellerId(detail.getSellerId());
@@ -1693,6 +1700,38 @@
taoBaoGoods.setUserType(detail.getIsTmall());
taoBaoGoods.setZkPrice(detail.getOrgPrice());
taoBaoGoods.setTkRate(detail.getCommission());
+ taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+ taoBaoGoods.setState(0);
+ 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(detail.getOriginalPrice());
+ taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
+ taoBaoGoods.setPictUrl(detail.getMainPic());
+ taoBaoGoods.setPictUrlWhite(detail.getMainPic());
+ if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))
+ taoBaoGoods.setPictUrl("https:" + taoBaoGoods.getPictUrl());
+
+ if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))
+ taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());
+
+ 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;
@@ -1784,38 +1823,68 @@
e.printStackTrace();
}
String result = HttpUtil.get(url);
- JSONObject resultJson = JSONObject.fromObject(result);
- JSONObject dataJson = resultJson.optJSONObject("data");
- JSONObject sellerJson = dataJson.optJSONObject("seller");
+
TaoBaoShop shop = new TaoBaoShop();
- shop.setGoodRatePercentage(new BigDecimal(sellerJson.optString("goodRatePercentage").replace("%", "")));
- shop.setId(sellerJson.optLong("userId"));
- JSONArray array = sellerJson.optJSONArray("evaluates");
- for (int i = 0; i < array.size(); i++) {
- JSONObject item = array.optJSONObject(i);
- if ("瀹濊礉鎻忚堪".equalsIgnoreCase(item.optString("title").trim())) {
- shop.setScoreGoods(new BigDecimal(item.optString("score").trim()));
- shop.setScoreGoodsD(new BigDecimal(item.optString("level").trim()));
- } else if ("鍗栧鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
- shop.setScoreSeller(new BigDecimal(item.optString("score").trim()));
- shop.setScoreSellerD(new BigDecimal(item.optString("level").trim()));
- } else if ("鐗╂祦鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
- shop.setScoreLogistics(new BigDecimal(item.optString("score").trim()));
- shop.setScoreLogisticsD(new BigDecimal(item.optString("level").trim()));
+ try {
+ JSONObject resultJson = JSONObject.fromObject(result);
+ JSONObject dataJson = resultJson.optJSONObject("data");
+ JSONObject sellerJson = dataJson.optJSONObject("seller");
+
+ shop.setGoodRatePercentage(new BigDecimal(sellerJson.optString("goodRatePercentage").replace("%", "")));
+
+ LogHelper.test("鍗栧淇℃伅:" + result);
+ shop.setId(sellerJson.optLong("userId"));
+ JSONArray array = sellerJson.optJSONArray("evaluates");
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject item = array.optJSONObject(i);
+ if ("瀹濊礉鎻忚堪".equalsIgnoreCase(item.optString("title").trim())) {
+ shop.setScoreGoods(new BigDecimal(item.optString("score").trim()));
+ shop.setScoreGoodsD(new BigDecimal(item.optString("level").trim()));
+ } else if ("鍗栧鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
+ shop.setScoreSeller(new BigDecimal(item.optString("score").trim()));
+ shop.setScoreSellerD(new BigDecimal(item.optString("level").trim()));
+ } else if ("鐗╂祦鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
+ shop.setScoreLogistics(new BigDecimal(item.optString("score").trim()));
+ shop.setScoreLogisticsD(new BigDecimal(item.optString("level").trim()));
+ }
}
+
+ shop.setSellerNick(sellerJson.optString("sellerNick"));
+ shop.setShopIcon("https:" + sellerJson.optString("shopIcon"));
+ shop.setShopId(sellerJson.optLong("shopId"));
+ shop.setShopName(sellerJson.optString("shopName"));
+ if ("B".equalsIgnoreCase(sellerJson.optString("sellerType")))
+ shop.setUserType(1);
+ else
+ shop.setUserType(0);
+
+ shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
+ } catch (Exception e) {
+ // if (1 > 0)
+ // return null;
+ try {
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
+ shop.setId(goods.getSellerId());
+ shop.setShopName(goods.getShopTitle());
+ shop.setUserType(goods.getUserType());
+ } catch (Exception e1) {
+ shop.setId(1L);
+ shop.setShopName("");
+ shop.setUserType(0);
+ }
+
+ shop.setGoodRatePercentage(new BigDecimal(100));
+ shop.setScoreGoods(new BigDecimal("4.9"));
+ shop.setScoreGoodsD(new BigDecimal("0"));
+ shop.setScoreSeller(new BigDecimal("4.9"));
+ shop.setScoreSellerD(new BigDecimal("0"));
+ shop.setScoreLogistics(new BigDecimal("4.9"));
+ shop.setScoreLogisticsD(new BigDecimal("0"));
+ shop.setSellerNick("");
+ shop.setShopIcon("https:");
+ shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
}
-
- shop.setSellerNick(sellerJson.optString("sellerNick"));
- shop.setShopIcon("https:" + sellerJson.optString("shopIcon"));
- shop.setShopId(sellerJson.optLong("shopId"));
- shop.setShopName(sellerJson.optString("shopName"));
- if ("B".equalsIgnoreCase(sellerJson.optString("sellerType")))
- shop.setUserType(1);
- else
- shop.setUserType(0);
-
- shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
return shop;
}
@@ -1830,6 +1899,25 @@
return "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
}
+ /**
+ * 鏄惁鍙互鍔犲叆娣樼ぜ閲戠殑棰勯�夊晢鍝佸簱
+ *
+ * @param v2
+ * @return
+ */
+ public static boolean canAddToTLJBuyGoods(TaoBaoGoodsBrief goods) {
+ BigDecimal tljMoney = getShareGoodsHongBaoInfo(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ // 涓嶈兘灏忎簬1鍧�
+ if (tljMoney.compareTo(new BigDecimal(1)) < 0 || tljMoney.compareTo(new BigDecimal(10)) > 0)
+ return false;
+
+ // 鍒稿悗浠蜂笉鑳藉ぇ浜�150
+ if (getAfterUseCouplePrice(goods).compareTo(new BigDecimal(150)) > 0)
+ return false;
+
+ return true;
+ }
+
public static void main(String[] args) {
String s = channelMap.get("3");
System.out.println(s);
--
Gitblit v1.8.0