From 0cb117d1048b669baab4b621ce70984176418d4c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 六月 2024 12:50:47 +0800
Subject: [PATCH] 支持购买月卡

---
 java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
old mode 100644
new mode 100755
index 043f925..7821979
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
@@ -6,6 +6,9 @@
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 
 /**
@@ -55,6 +58,15 @@
             return value;
         }
 
+        //2.0 Date 杞� Date
+        if (value instanceof LocalDateTime && target == Date.class) {
+            ZoneId zoneId = ZoneId.systemDefault();
+            ZonedDateTime zonedDateTime = ((LocalDateTime)value).atZone(zoneId);
+            Date date = Date.from(zonedDateTime.toInstant());
+            return date;
+        }
+
+
         // 3.0 Date 杞� String
         if (value instanceof Date && target == String.class) {
             Date date = (Date) value;
@@ -78,7 +90,7 @@
             return newDate;
         }
 
-        if (value instanceof BigDecimal) {
+        if (value instanceof BigDecimal && target == String.class) {
             BigDecimal bd = (BigDecimal) value;
             return bd.toPlainString();
         }
@@ -87,14 +99,23 @@
         }
 
         if (target == int.class || target == Integer.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Integer.parseInt(String.valueOf(value));
         }
 
         if (target == long.class || target == Long.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Long.parseLong(String.valueOf(value));
         }
 
         if (target == double.class || target == Double.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Double.parseDouble(String.valueOf(value));
         }
 

--
Gitblit v1.8.0