From 759f8df85ddb840682f91bad31e874fa0b58c075 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 14 四月 2021 19:16:12 +0800
Subject: [PATCH] 订单系统修改

---
 src/main/java/com/yeshi/buwan/util/StringUtil.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/util/StringUtil.java b/src/main/java/com/yeshi/buwan/util/StringUtil.java
index 465e0d2..cb8e1e7 100644
--- a/src/main/java/com/yeshi/buwan/util/StringUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/StringUtil.java
@@ -9,7 +9,9 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
+import java.util.Collection;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,6 +57,18 @@
         String st = "";
         for (int i = 0; i < srcList.size(); i++) {
             st += srcList.get(i) + seperate;
+        }
+        if (st.endsWith(seperate)) {
+            st = st.substring(0, st.length() - seperate.length());
+        }
+        return st;
+    }
+
+
+    public static String join(Collection srcList, String seperate) {
+        String st = "";
+        for (Iterator<String> its = srcList.iterator(); its.hasNext(); ) {
+            st += its.next() + seperate;
         }
         if (st.endsWith(seperate)) {
             st = st.substring(0, st.length() - seperate.length());
@@ -174,15 +188,15 @@
         } else {
             Gson gson = new GsonBuilder().enableComplexMapKeySerialization().excludeFieldsWithoutExposeAnnotation()
                     .setDateFormat(DateFormat.LONG).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
-                @Override
-                public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
-                    if (value == null) {
-                        return new JsonPrimitive("0");
-                    } else {
-                        return new JsonPrimitive(value.getTime());
-                    }
-                }
-            }).setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)// 浼氭妸瀛楁棣栧瓧姣嶅ぇ鍐�
+                        @Override
+                        public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+                            if (value == null) {
+                                return new JsonPrimitive("0");
+                            } else {
+                                return new JsonPrimitive(value.getTime());
+                            }
+                        }
+                    }).setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)// 浼氭妸瀛楁棣栧瓧姣嶅ぇ鍐�
                     .setPrettyPrinting().setVersion(1.0).create();
             String st = gson.toJson(o);
             return Utils.JsonFilter(st);

--
Gitblit v1.8.0