From 3225853ef3f2671e31edc41eb2bcc24adea1b18c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 14:40:45 +0800
Subject: [PATCH] 商品领券bug修复

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 0a2f2fb..9f9bcc3 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
@@ -1814,9 +1814,8 @@
 				.optJSONArray("n_tbk_order");
 		for (int i = 0; i < array.size(); i++) {
 
-		
-				JSONObject item = array.optJSONObject(i);
-				try {
+			JSONObject item = array.optJSONObject(i);
+			try {
 				TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
 				taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
 				taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
@@ -1875,14 +1874,19 @@
 					taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
 				else
 					taoBaoOrder.setTkMoney(new BigDecimal(0));
-				taoBaoOrder.setTkRate(new BigDecimal(item.optString("commission_rate")));
+				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瀽鍑洪敊");
+					LogHelper.errorDetailInfo(e, "璁㈠崟鍙蜂俊鎭�:" + item.toString(), "璁㈠崟瑙f瀽鍑洪敊");
 				} catch (Exception e1) {
 				}
 			}
@@ -1923,7 +1927,8 @@
 			String itemLink = resultJSON.optString("item_url");
 			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 			goods.setAuctionUrl(itemLink);
-			goods.setCouponLink(couponLink);
+			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))
+				goods.setCouponLink(couponLink);
 			return goods;
 		} catch (TaoKeApiException e) {
 			e.printStackTrace();

--
Gitblit v1.8.0