From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index 1e99bca..47579d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -86,11 +86,82 @@
date = sdf.parse(st);
return date.getTime();
} catch (Exception e) {
- // e.printStackTrace();
+ e.printStackTrace();
return 0;
}
}
-
+
+ public static Date parseYYYYMM(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD_HHMMSS(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+ public static Date parseYYYYMMDD_HHMM(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseDotYYYYMMDD(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseDotCommon(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseDotCommon2(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
public static long convertAllTimeToTemp(String st) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -121,6 +192,23 @@
return date;
}
+ public static String formatHHMM_12H(Date time) {
+ SimpleDateFormat sdf = new SimpleDateFormat("hh:mm");
+ String date = sdf.format(time);
+ return date;
+ }
+
+ public static String formatYMDHHMM(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ try {
+ return sdf.format(date);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
public static String formatDateAddT(Date date) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
try {
--
Gitblit v1.8.0