From 97486e6417f97714d33b0214773876531461f6cb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 10 四月 2020 17:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 e0da688..48df09b 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
@@ -10,11 +10,13 @@
import com.yeshi.fanli.dto.taobao.TaoBaoOrderResultDTO;
import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrderGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoPunishOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
@@ -187,6 +189,18 @@
taoBaoOrder.setRelationId(item.optString("relation_id"));
taoBaoOrder.setSpecialId(item.optString("special_id"));
taoBaoOrder.setTradeId(item.optString("trade_id"));
+ // 瑙ｆ瀽鍟嗗搧淇℃伅
+ TaoBaoOrderGoods goods = new TaoBaoOrderGoods();
+ goods.setCategoryName(item.optString("item_category_name"));
+ goods.setCreateTime(new Date());
+ goods.setGoodsId(item.optLong("item_id"));
+ goods.setImg(item.optString("item_img"));
+ goods.setLink(item.optString("item_link"));
+ goods.setPrice(item.optString("item_price"));
+ goods.setTitle(item.optString("item_title"));
+ goods.setTradeId(item.optString("trade_id"));
+
+ taoBaoOrder.setGoods(goods);
orderList.add(taoBaoOrder);
} catch (Exception e) {
try {
@@ -485,6 +499,8 @@
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
try {
JSONObject json = TaoKeBaseUtil.baseRequest(params, app);
+ if (Constant.IS_TEST)
+ System.out.println(json);
return parseTaoBaoOrderNew(json.toString());
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0