From e1dcde771ebef00546d747fda274c330a31a59b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 10 Feb 2020 15:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B9=B4=E9=BE=84=E7=9A=84=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/common/entity/MarkerUserInfo.java  | 103 ++++++++++--------
 1 file changed, 58 insertions(+), 45 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
index 2ee2a01ab2..e13d18d782 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
@@ -14,64 +14,77 @@ public class MarkerUserInfo implements Serializable {
     private String userName;//用户昵称
     private String userHead;//用户头像
     private String gender;//gender": "男｜女｜无（也可以0｜1｜2根据实际库存返回即可）
-    private int age;// 年龄段，可以为空，与车聊聊一致
+    private Integer age;// 年龄段，可以为空，与车聊聊一致
 
-    public void setAge(int age) {
+    public void setAge(Integer age) {
         this.age = age;
     }
 
     public int getAgeNumber() {
-        return age;
+        if (age != null) {
+            return age;
+        }
+        return -1;
     }
 
     public String getAge() {
-        Calendar cal = Calendar.getInstance();
-        int year = cal.get(Calendar.YEAR);
+        try {
+            if (getAgeNumber() >= 0) {
 
-        //2020-30=1990
-        double ageDiffer = year - age;
-        String ageStr = "" + ageDiffer;
-        char[] ageChars = ageStr.toCharArray();
+                Calendar cal = Calendar.getInstance();
+                int year = cal.get(Calendar.YEAR);
 
-        //1990
-        char ageChar = ageChars[2];
+                //2020-30=1990
+                double ageDiffer = year - getAgeNumber();
+                String ageStr = "" + ageDiffer;
+                char[] ageChars = ageStr.toCharArray();
 
-        String ageString = "未设置";
+                //1990
+                char ageChar = ageChars[2];
 
-        switch (ageChar) {
-            case '0':
-                ageString = "00后";
-                break;
-            case '1':
-                ageString = "10后";
-                break;
-            case '2':
-                ageString = "20后";
-                break;
-            case '3':
-                ageString = "30后";
-                break;
-            case '4':
-                ageString = "40后";
-                break;
-            case '5':
-                ageString = "50后";
-                break;
-            case '6':
-                ageString = "60后";
-                break;
-            case '7':
-                ageString = "70后";
-                break;
-            case '8':
-                ageString = "80后";
-                break;
-            case '9':
-                ageString = "90后";
-                break;
+                String ageString = "未设置";
+
+                switch (ageChar) {
+                    case '0':
+                        ageString = "00后";
+                        break;
+                    case '1':
+                        ageString = "10后";
+                        break;
+                    case '2':
+                        ageString = "20后";
+                        break;
+                    case '3':
+                        ageString = "30后";
+                        break;
+                    case '4':
+                        ageString = "40后";
+                        break;
+                    case '5':
+                        ageString = "50后";
+                        break;
+                    case '6':
+                        ageString = "60后";
+                        break;
+                    case '7':
+                        ageString = "70后";
+                        break;
+                    case '8':
+                        ageString = "80后";
+                        break;
+                    case '9':
+                        ageString = "90后";
+                        break;
+                }
+
+                return ageString;
+            } else {
+                return "";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
         }
-
-        return ageString;
     }
 
     public int getGenderValue() {