From a3e7322a0aa6b5b13a84bc76923d0c6b68b13276 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 十二月 2019 18:27:12 +0800
Subject: [PATCH] 订单修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 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 ae705bc..e0da688 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
@@ -31,7 +31,6 @@
public static int TK_STATUS_SUCCESS = 14;
public static int TK_STATUS_INVALID = 13;
-
private static TaoBaoPunishOrder parsePunishOrder(JSONObject data) {
TaoBaoPunishOrder order = new TaoBaoPunishOrder();
order.setPunishStatus(data.optString("punish_status"));
@@ -202,16 +201,15 @@
private static TaoBaoOrderResultDTO parseTaoBaoOrderNew(String response) {
- TaoBaoOrderResultDTO dto=new TaoBaoOrderResultDTO(false, false, null, new ArrayList<>());
-
+ TaoBaoOrderResultDTO dto = new TaoBaoOrderResultDTO(false, false, null, new ArrayList<>());
+
List<TaoBaoOrder> orderList = new ArrayList<>();
JSONArray array = null;
JSONObject data = JSONObject.fromObject(response);
try {
- JSONObject rootData=data.optJSONObject("tbk_order_details_get_response").optJSONObject("data");
- array =rootData .optJSONObject("results")
- .optJSONArray("publisher_order_dto");
- dto.setHasPre( rootData.optBoolean("has_pre"));
+ JSONObject rootData = data.optJSONObject("tbk_order_details_get_response").optJSONObject("data");
+ array = rootData.optJSONObject("results").optJSONArray("publisher_order_dto");
+ dto.setHasPre(rootData.optBoolean("has_pre"));
dto.setPositionIndex(rootData.optString("position_index"));
dto.setHasNext(rootData.optBoolean("has_next"));
} catch (Exception e) {
@@ -260,11 +258,14 @@
taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
else
taoBaoOrder.setPayment(new BigDecimal(0));
- taoBaoOrder.setPrice(new BigDecimal(item.optString("item_price")));
+ if (StringUtil.isNullOrEmpty(item.optString("item_price")))
+ taoBaoOrder.setPrice(new BigDecimal(0));
+ else
+ taoBaoOrder.setPrice(new BigDecimal(item.optString("item_price")));
if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
taoBaoOrder.setSettlement(new BigDecimal(item.optString("pay_price")));
else
- taoBaoOrder.setSettlement(new BigDecimal(0));
+ taoBaoOrder.setSettlement(taoBaoOrder.getPayment());
taoBaoOrder.setSettlementTime(item.optString("tk_earning_time"));
taoBaoOrder.setShop(item.optString("seller_shop_title"));
taoBaoOrder.setSourceMediaId(item.optString("site_id"));
@@ -396,7 +397,7 @@
return finalResult;
}
-
+
/**
* 鏂扮増鏈窐瀹濊鍗�
*/
@@ -412,21 +413,28 @@
return getTaoBaoOrderList(startTime, endTime, queryType, 3);
}
+ /**
+ * 娣樺疂娓犻亾璁㈠崟
+ *
+ * @param startTime
+ * @param endTime
+ * @param queryType
+ * @return
+ */
public static List<TaoBaoOrder> getTaoBaoRelationOrderList(long startTime, long endTime, int queryType) {
return getTaoBaoOrderList(startTime, endTime, queryType, 2);
}
-
+
public static List<TaoBaoOrder> getTaoBaoCommonOrderList(long startTime, long endTime, int queryType) {
return getTaoBaoOrderList(startTime, endTime, queryType, 1);
}
-
-
- public static List<TaoBaoOrder> getTaoBaoOrderList(long startTime, long endTime, int queryType,int orderScene) {
+
+ public static List<TaoBaoOrder> getTaoBaoOrderList(long startTime, long endTime, int queryType, int orderScene) {
List<TaoBaoOrder> orderList = new ArrayList<>();
// 璺ㄥ害20鍒嗛挓
- long span=(1000 * 60 * 20L);
+ long span = (1000 * 60 * 20L);
long jianGe = endTime - startTime;
- long page = jianGe %span==0?jianGe/span:jianGe /span+1 ;
+ long page = jianGe % span == 0 ? jianGe / span : jianGe / span + 1;
if (page == 0)
page = 1;
for (int i = 1; i <= page; i++) {
@@ -435,22 +443,33 @@
if (end > endTime)
end = endTime;
TaoBaoOrderResultDTO dto = queryNewOrder(TimeUtil.getGernalTime(start, "yyyy-MM-dd HH:mm:ss"),
- TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"),null, queryType, orderScene);
+ TimeUtil.getGernalTime(end, "yyyy-MM-dd HH:mm:ss"), null, queryType, orderScene);
if (dto != null)
orderList.addAll(dto.getOrderList());
- while(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);
+ while (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);
if (dto != null)
orderList.addAll(dto.getOrderList());
}
}
return orderList;
}
-
- private static TaoBaoOrderResultDTO queryNewOrder(String startTime, String endTime,String positionIndex, int queryType, int orderScene) {
+ /**
+ * 娣樺疂璁㈠崟鏌ヨ
+ *
+ * @param startTime
+ * @param endTime
+ * @param positionIndex
+ * @param queryType
+ * 1锛氭寜鐓ц鍗曟窐瀹㈠垱寤烘椂闂存煡璇紝2:鎸夌収璁㈠崟娣樺浠樻鏃堕棿鏌ヨ锛�3:鎸夌収璁㈠崟娣樺缁撶畻鏃堕棿鏌ヨ
+ * @param orderScene
+ * @return
+ */
+ private static TaoBaoOrderResultDTO queryNewOrder(String startTime, String endTime, String positionIndex,
+ int queryType, int orderScene) {
Map<String, String> params = new HashMap<>();
params.put("query_type", queryType + "");
params.put("page_size", "100");
@@ -458,7 +477,7 @@
params.put("end_time", endTime);
params.put("page_no", "1");
params.put("order_scene", orderScene + "");
- if(!StringUtil.isNullOrEmpty(positionIndex))
+ if (!StringUtil.isNullOrEmpty(positionIndex))
params.put("position_index", positionIndex + "");
params.put("method", "taobao.tbk.order.details.get");
TaoKeAppInfo app = new TaoKeAppInfo();
--
Gitblit v1.8.0