From 3aadf7bed39a775349097ca991878613717b768f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 18 十月 2019 15:00:54 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..46132ee 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
@@ -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);
@@ -821,7 +821,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