From 8e751a7ee99afce71ac615a6111228c5c785ee46 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 14 八月 2019 09:52:59 +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/dataoke/DaTaoKeApiUtil.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
index aa0839f..656127b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
@@ -525,7 +525,13 @@
private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
- detail.setCreateTime(new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
+ } else {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ }
return detail;
}
--
Gitblit v1.8.0