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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..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
@@ -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(), "璁㈠崟瑙ｆ瀽鍑洪敊");
+ LogHelper.errorDetailInfo(e, "璁㈠崟鍙蜂俊鎭�:" + item.toString(), "璁㈠崟瑙ｆ瀽鍑洪敊");
} catch (Exception e1) {
}
}
--
Gitblit v1.8.0