From 8b37d2f16d4aa7c7ce19829b74307ae0072b127f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 二月 2019 10:44:55 +0800
Subject: [PATCH] 1.5.1  奖励券、免单券

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |  136 +++++++++++++++++++++++++--------------------
 1 files changed, 75 insertions(+), 61 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 1ecd044..f5a3342 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -22,6 +22,7 @@
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.log.TaoKeLogHelper;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -1812,70 +1813,83 @@
 		JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")
 				.optJSONArray("n_tbk_order");
 		for (int i = 0; i < array.size(); i++) {
+
 			JSONObject item = array.optJSONObject(i);
-			TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
-			taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
-			taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
-			taoBaoOrder.setAuctionId(item.optLong("num_iid"));
-			taoBaoOrder.setClassName(item.optString("auction_category"));
-			taoBaoOrder.setClickTime(item.optString("click_time"));
-			taoBaoOrder.setCount(item.optInt("item_num"));
-			taoBaoOrder.setCreateTime(item.optString("create_time"));
-			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
-				taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));
-			else
-				taoBaoOrder.seteIncome(new BigDecimal(0));
+			try {
+				TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
+				taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
+				taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
+				taoBaoOrder.setAuctionId(item.optLong("num_iid"));
+				taoBaoOrder.setClassName(item.optString("auction_category"));
+				taoBaoOrder.setClickTime(item.optString("click_time"));
+				taoBaoOrder.setCount(item.optInt("item_num"));
+				taoBaoOrder.setCreateTime(item.optString("create_time"));
+				if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
+					taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));
+				else
+					taoBaoOrder.seteIncome(new BigDecimal(0));
 
-			if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
-				taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
-			else
-				taoBaoOrder.setEstimate(new BigDecimal(0));
-			taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
-			taoBaoOrder.setLatestUpdateTime(null);
-			taoBaoOrder.setManagerWangWang(null);
-			taoBaoOrder.setOrderBy(null);
-			taoBaoOrder.setOrderId(item.optString("trade_parent_id"));
-			if (item.optInt("tk_status") == 12)
-				taoBaoOrder.setOrderState("璁㈠崟浠樻");
-			else if (item.optInt("tk_status") == 3)
-				taoBaoOrder.setOrderState("璁㈠崟缁撶畻");
-			else if (item.optInt("tk_status") == 13)
-				taoBaoOrder.setOrderState("璁㈠崟澶辨晥");
-			else if (item.optInt("tk_status") == 14)
-				taoBaoOrder.setOrderState("璁㈠崟鎴愬姛");
+				if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
+					taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
+				else
+					taoBaoOrder.setEstimate(new BigDecimal(0));
+				taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
+				taoBaoOrder.setLatestUpdateTime(null);
+				taoBaoOrder.setManagerWangWang(null);
+				taoBaoOrder.setOrderBy(null);
+				taoBaoOrder.setOrderId(item.optString("trade_parent_id"));
+				if (item.optInt("tk_status") == 12)
+					taoBaoOrder.setOrderState("璁㈠崟浠樻");
+				else if (item.optInt("tk_status") == 3)
+					taoBaoOrder.setOrderState("璁㈠崟缁撶畻");
+				else if (item.optInt("tk_status") == 13)
+					taoBaoOrder.setOrderState("璁㈠崟澶辨晥");
+				else if (item.optInt("tk_status") == 14)
+					taoBaoOrder.setOrderState("璁㈠崟鎴愬姛");
 
-			taoBaoOrder.setOrderType(item.optString("order_type"));
-			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
-				taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
-			else
-				taoBaoOrder.setPayment(new BigDecimal(0));
-			taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
-			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
-				taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
-			else
-				taoBaoOrder.setSettlement(new BigDecimal(0));
-			taoBaoOrder.setSettlementTime(item.optString("earning_time"));
-			taoBaoOrder.setShop(item.optString("seller_shop_title"));
-			taoBaoOrder.setSourceMediaId(item.optString("site_id"));
-			taoBaoOrder.setSourceMediaName(item.optString("site_name"));
-			taoBaoOrder.setsRatio(null);
-			taoBaoOrder.setSubsidy(null);
-			if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
-				taoBaoOrder
-						.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
-			taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
-			taoBaoOrder.setTechnologySupportPercent(null);
-			taoBaoOrder.setThirdService(null);
-			taoBaoOrder.setTitle(item.optString("item_title"));
-			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
-				taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
-			else
-				taoBaoOrder.setTkMoney(new BigDecimal(0));
-			taoBaoOrder.setTkRate(new BigDecimal(item.optString("commission_rate")));
-			taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
-			taoBaoOrder.setRelationId(item.optString("relation_id"));
-			taoBaoOrder.setSpecialId(item.optString("special_id"));
-			orderList.add(taoBaoOrder);
+				taoBaoOrder.setOrderType(item.optString("order_type"));
+				if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
+					taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
+				else
+					taoBaoOrder.setPayment(new BigDecimal(0));
+				taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
+				if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
+					taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
+				else
+					taoBaoOrder.setSettlement(new BigDecimal(0));
+				taoBaoOrder.setSettlementTime(item.optString("earning_time"));
+				taoBaoOrder.setShop(item.optString("seller_shop_title"));
+				taoBaoOrder.setSourceMediaId(item.optString("site_id"));
+				taoBaoOrder.setSourceMediaName(item.optString("site_name"));
+				taoBaoOrder.setsRatio(null);
+				taoBaoOrder.setSubsidy(null);
+				if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
+					taoBaoOrder.setSubsidyRatio(
+							new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
+				taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
+				taoBaoOrder.setTechnologySupportPercent(null);
+				taoBaoOrder.setThirdService(null);
+				taoBaoOrder.setTitle(item.optString("item_title"));
+				if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
+					taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
+				else
+					taoBaoOrder.setTkMoney(new BigDecimal(0));
+				if (!StringUtil.isNullOrEmpty(item.optString("commission_rate")))
+					taoBaoOrder
+							.setTkRate(new BigDecimal(item.optString("commission_rate")).multiply(new BigDecimal(100)));
+				else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))
+					taoBaoOrder.setTkRate(
+							new BigDecimal(item.optString("total_commission_rate")).multiply(new BigDecimal(100)));
+				taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
+				taoBaoOrder.setRelationId(item.optString("relation_id"));
+				taoBaoOrder.setSpecialId(item.optString("special_id"));
+				orderList.add(taoBaoOrder);
+			} catch (Exception e) {
+				try {
+					LogHelper.errorDetailInfo(e, "璁㈠崟鍙蜂俊鎭�:" + item.toString(), "璁㈠崟瑙f瀽鍑洪敊");
+				} catch (Exception e1) {
+				}
+			}
 		}
 
 		return orderList;

--
Gitblit v1.8.0