From ac913f2f98cfb49ef98a2b07a7533b30e3f253da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 14:51:52 +0800
Subject: [PATCH] 20210707

---
 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
index b22744f..b172628 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -855,15 +855,16 @@
 //            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
 //            map.put("orderid", map.get("orderId").toString());
 //            map.put("createtime", map.get("createTime").toString());
-            map.put("orderid", map.get("orderId").toString());
-            map.put("address", map.get("address").toString());
+            map.put("orderid", String.valueOf(map.get("orderId")));
+            map.put("address", String.valueOf(map.get("address")));
             map.put("status", map.get("status"));
             map.put("type", map.get("type"));
-            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
-            map.put("score", DoubleUtil.roundTwo(map.get("score").toString()));
-            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
-            map.put("name", (map.get("name")==null?"":m.get("name")).toString());
-            map.put("createtime", map.get("createTime").toString());
+            map.put("money", DoubleUtil.roundTwo(String.valueOf(map.get("money"))));
+            map.put("score", DoubleUtil.roundTwo(String.valueOf(map.get("score"))));
+            map.put("weight", DoubleUtil.roundThree(String.valueOf(map.get("weight"))));
+
+            map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":m.get("name"))));
+            map.put("createtime", String.valueOf(map.get("createTime")));
         }
         m.put("orderList", odlist);
         m.put("count", pageInfo.getTotal());

--
Gitblit v1.9.1