From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 55 ++++++++-----------------------------------------------
1 files changed, 8 insertions(+), 47 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
index 3852d0b..ff4dc77 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -101,14 +101,14 @@
String as = gm.getResponseBodyAsString();
JSONObject root = JSONObject.fromObject(as);
if (root.optInt("code") == 0) {// 涓婃姤鎴愬姛
- LogHelper.cookieLog("涓婃姤鎴愬姛锛�");
+ LogHelper.error("涓婃姤鎴愬姛锛�");
return;
}
- LogHelper.cookieLog("涓婃姤澶辫触锛�");
+ LogHelper.error("涓婃姤澶辫触锛�");
} catch (Exception e) {
e.printStackTrace();
- LogHelper.cookieLog("涓婃姤澶辫触锛�");
+ LogHelper.error("涓婃姤澶辫触锛�");
}
}
@@ -121,7 +121,7 @@
public static List<TaoBaoOrder> getOrderList(int day, TaoBaoUnionConfig config) {
String cookie1 = getTaoBaoCookie(config.getAccount());
- LogHelper.cookieLog("璐﹀彿涓猴細" + config.getAccount() + ",cookie涓猴細" + cookie1);
+ LogHelper.error("璐﹀彿涓猴細" + config.getAccount() + ",cookie涓猴細" + cookie1);
String[] cookies = new String[] { cookie1 };
List<TaoBaoOrder> list = new ArrayList<TaoBaoOrder>();
@@ -195,7 +195,7 @@
private static List<TaoBaoOrder> downLoadOrderFromTaoBao(String url, TaoBaoUnionConfig config)
throws TaoBaoOrderException {
String cookie1 = getTaoBaoCookie(config.getAccount());
- LogHelper.cookieLog("璐﹀彿涓猴細" + config.getAccount() + ",cookie涓猴細" + cookie1);
+ LogHelper.error("璐﹀彿涓猴細" + config.getAccount() + ",cookie涓猴細" + cookie1);
String[] cookies = new String[] { cookie1 };
List<TaoBaoOrder> list = new ArrayList<TaoBaoOrder>();
int i = 0;
@@ -688,7 +688,7 @@
try {
setOrderBy(map.get(orderId));
} catch (Exception e) {
- LogHelper.errorDetailInfo(e, "璁㈠崟鍙�:" + orderId, "璁㈠崟鎺掑簭鍊肩伆搴︽祴璇�");
+// LogHelper.errorDetailInfo(e, "璁㈠崟鍙�:" + orderId, "璁㈠崟鎺掑簭鍊肩伆搴︽祴璇�");
}
}
} catch (Exception e) {
@@ -734,7 +734,7 @@
String tradeId = taoBaoOrder.getTradeId();
String orderByStr = tradeId.substring(startIndex, endIndex + 1);
if (orderByStr.length() > 8) {
- LogHelper.error(taoBaoOrder.getOrderId()+ "-璁㈠崟鐨刼rderBy瓒呰繃8浣�:" + taoBaoOrder.getOrderBy());
+ LogHelper.error(taoBaoOrder.getOrderId() + "-璁㈠崟鐨刼rderBy瓒呰繃8浣�:" + taoBaoOrder.getOrderBy());
}
int orderBy = Integer.parseInt(orderByStr);
// taoBaoOrder.setOrderBy(orderBy);
@@ -763,45 +763,6 @@
return TimeUtil.convertToTimeTemp(time, "yyyy-M-dd HH:mm:ss");
}
- public static CommonOrder convert(TaoBaoOrder taoBaoOrder) {
- CommonOrder commonOrder = new CommonOrder();
- commonOrder.setCount(taoBaoOrder.getCount());
- commonOrder.setCreateTime(new Date());
- if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null)
- commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy()));
- else
- commonOrder.seteIncome(taoBaoOrder.geteIncome());
- commonOrder.setEstimate(taoBaoOrder.getEstimate());
- commonOrder.setOrderNo(taoBaoOrder.getOrderId());
- commonOrder.setPayment(taoBaoOrder.getPayment());
- commonOrder.setSettlement(taoBaoOrder.getSettlement());
- if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))
- commonOrder.setSettleTime(
- new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));
- commonOrder.setSourcePosition(String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(),
- taoBaoOrder.getAdPositionId()));
- commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO);
- int state = 0;
- if ("璁㈠崟浠樻".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
- state = CommonOrder.STATE_FK;
- } else if ("璁㈠崟鎴愬姛".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
- state = CommonOrder.STATE_FK;
- } else if ("璁㈠崟澶辨晥".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
- state = CommonOrder.STATE_SX;
- } else if ("璁㈠崟缁撶畻".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
- state = CommonOrder.STATE_JS;
- }
- commonOrder.setOrderBy(taoBaoOrder.getOrderBy());
- commonOrder.setState(state);
- commonOrder.setThirdCreateTime(
- new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
- commonOrder.setUpdateTime(new Date());
- commonOrder.setTradeId(taoBaoOrder.getTradeId());
-
- return commonOrder;
-
- }
-
/**
* 鑾峰彇涓�缁勮鍗曠殑hash鍊�
*
@@ -821,7 +782,7 @@
Collections.sort(orderList, orderCM);
String sts = "";
for (TaoBaoOrder order : orderList) {
- sts += order.getTradeId();
+ sts += (order.getTradeId() + "-" + order.getSpecialId() + "-" + order.getRelationId());
}
return StringUtil.Md5(sts);
}
--
Gitblit v1.8.0