From 6351f4de939ffd51b5c10a90b21909206d9c94ab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 四月 2019 14:23:34 +0800
Subject: [PATCH] 增加品牌

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
index 70bc773..4c9edba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
@@ -180,8 +180,7 @@
 		map.put("tb_trade_parent_id", "370829441412331676");
 		map.put("punish_status", "2");
 		map.put("violation_type", "2");
-		
-		
+
 		// map.put("start_time", "2019-01-01 00:00:00");
 		TaoKeAppInfo app = new TaoKeAppInfo();
 		app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
@@ -307,7 +306,8 @@
 				taoBaoOrder.setSourceMediaId(item.optString("site_id"));
 				taoBaoOrder.setSourceMediaName(item.optString("site_name"));
 				taoBaoOrder.setsRatio(null);
-				taoBaoOrder.setSubsidy(null);
+				if (!StringUtil.isNullOrEmpty(item.optString("subsidy_fee")))// 琛ヨ创閲戦
+					taoBaoOrder.setSubsidy(new BigDecimal(item.optString("subsidy_fee")));
 				if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
 					taoBaoOrder.setSubsidyRatio(
 							new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));

--
Gitblit v1.8.0