Administrator
2018-11-28 e3dabfd944d4a4c77cd7ec309d7c99e7d05077fc
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -424,18 +424,32 @@
      
      for (ThreeSale threeSale: list) {
         JSONObject object = new JSONObject();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         SimpleDateFormat sdf = new SimpleDateFormat("MM.dd HH:mm");
         SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
         SimpleDateFormat formatYears = new SimpleDateFormat("yyyy");
         
         Date todayTime = new Date();
         // 邀请id
         object.put("inviteId", threeSale.getId());
         
         // 加入队列时间
         Long createTime = threeSale.getCreateTime();
         Date inviteTime = new Date(createTime);
         object.put("inviteTime", sdf.format(inviteTime) + "加入");
         object.put("inviteTime", format.format(inviteTime) + " 加入");
         
         String nickName = null;
         String memoName = "";
         ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
         if (threeSaleExtraInfo != null) {
            if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
               memoName = threeSaleExtraInfo.getNickname();
            }
         }
         object.put("memoName", memoName);
         String nickName = "";
         String portrait = "";
         Long lastLoginTime = null;
         String portrait = null;
         Long workerId = null;
         
         UserInfo worker = threeSale.getWorker();
@@ -445,8 +459,7 @@
            lastLoginTime = worker.getLastLoginTime();
            nickName = worker.getNickName();
         }
         object.put("workerId", workerId);
         object.put("nickName", nickName);
         object.put("portrait", portrait);
         
         int type = 0;
@@ -462,7 +475,14 @@
            
            JSONArray array1 = new JSONArray();
            array1.add(fontColor1);
            array1.add("最近登陆" + sdf.format(lastLoginTime));
            if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {
               // 本年
               array1.add("最近登陆 " + sdf.format(lastLoginTime));
            } else {
               // 往年
               array1.add("最近登陆 " + format.format(lastLoginTime));
            }
            
            array.add(array1);
            
@@ -479,7 +499,7 @@
            Calendar c = Calendar.getInstance();
            c.setTime(inviteTime);
            c.add(Calendar.DAY_OF_MONTH, 60);// 邀请不超过60天
            Date todayTime = new Date();
            
            long days =  (c.getTimeInMillis() -todayTime.getTime()) / (1000*3600*24);
            if (days < 0) {
@@ -492,7 +512,7 @@
            
            JSONArray array2 = new JSONArray();
            array2.add(fontColor2);
            array2.add(days+"天 ");
            array2.add(days+"天");
            
            JSONArray array3 = new JSONArray();
            array3.add(fontColor1);
@@ -506,15 +526,6 @@
         object.put("type", type);
         object.put("recentMsg", array);
         
         ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
         if (threeSaleExtraInfo != null) {
            if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
               nickName = threeSaleExtraInfo.getNickname();
            }
         }
         object.put("nickName", nickName);
         resultArray.add(object);
      }
      
@@ -522,8 +533,6 @@
      result.put("result_list", resultArray);
      
      return result;
   }
   
}