From 9eeda0d3049b71877c373c04d65533939b5582ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 02 九月 2019 09:55:55 +0800
Subject: [PATCH] getBoss方法只查询有效上级信息

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |  124 +++++++++++++++++++++++++++++------------
 1 files changed, 87 insertions(+), 37 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 110b1a1..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
@@ -63,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;
@@ -769,13 +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);
-//		}
+		// if(Constant.IS_TEST)
+		// {
+		// List<ClientTextStyleVO> labels = new ArrayList<>();
+		// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+		// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+		// tg.setLabels(labels);
+		// }
 		return tg;
 	}
 
@@ -1690,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());
@@ -1822,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;
 	}
@@ -1868,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