From 01955bc3f6e6eec6d82a5a3848efde1fa6cc8137 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 30 九月 2020 17:29:26 +0800 Subject: [PATCH] 云发单优化 --- fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 4 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 3a1a2e5..b44b957 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 @@ -7,19 +7,20 @@ import java.util.List; import java.util.Map; +import com.yeshi.fanli.dto.order.OrderQuery; 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.common.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; +import org.yeshi.utils.TimeUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -204,7 +205,10 @@ goods.setPrice(item.optString("item_price")); goods.setTitle(item.optString("item_title")); goods.setTradeId(item.optString("trade_id")); - + if (goods.getImg() != null && !goods.getImg().startsWith("http")) { + goods.setImg("http:" + goods.getImg()); + } + taoBaoOrder.setGoods(goods); orderList.add(taoBaoOrder); } catch (Exception e) { @@ -361,7 +365,7 @@ TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"), null, queryType, orderScene); if (dto != null) orderList.addAll(dto.getOrderList()); - while (dto.isHasNext()) { + while (dto!=null&&dto.isHasNext()) { dto = queryNewOrder(TimeUtil.getGernalTime(start, "yyyy-MM-dd HH:mm:ss"), TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"), dto.getPositionIndex(), queryType, orderScene); @@ -408,4 +412,48 @@ } return null; } + + + @Deprecated + public static List<TaoBaoOrder> queryTaoBaoOrder(OrderQuery orderQuery, String appKey, String appSecret) { + + Map<String, String> map = new HashMap<>(); + map.put("method", "taobao.tbk.order.get"); + map.put("fields", + "tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id"); + if (orderQuery.startTime != null) + map.put("start_time", orderQuery.startTime); + if (orderQuery.span != null) + map.put("span", orderQuery.span + ""); + map.put("page_no", orderQuery.pageNo + ""); + map.put("page_size", orderQuery.pageSize + ""); + + if (orderQuery.tkStatus != null) + map.put("tk_status", orderQuery.tkStatus + ""); + if (orderQuery.orderQueryType != null) + map.put("order_query_type", orderQuery.orderQueryType); + if (orderQuery.orderScene != null) + map.put("order_scene", orderQuery.orderScene + ""); + + if (orderQuery.orderCountType != null) + map.put("order_count_type", orderQuery.orderCountType + ""); + + TaoKeAppInfo app = new TaoKeAppInfo(); + app.setAppKey(appKey); + app.setAppSecret(appSecret); + try { + JSONObject json = TaoKeBaseUtil.baseRequest(map, app); + System.out.println(json); + } catch (TaoKeApiException e) { + e.printStackTrace(); + } + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + return null; + } } -- Gitblit v1.8.0