队员细节优化

喻健

2018-11-22 8ce2aa79bb38cf83849e769d77fa223bc1ad805e

队员细节优化

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -1637,7 +1637,7 @@
                bossData.put("portrait", boss.getPortrait());

            }

            

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

            Long createTime = threeSale.getCreateTime();

            Date inviteTime = new Date(createTime);

            bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));


 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -344,6 +344,7 @@
        ON ts.`boss_id` = ff.`tf_boss_id` AND ts.`worker_id` = ff.`tf_worker_id`
        WHERE ts.`boss_id` =  #{uid}
        ORDER BY ts.state DESC, ts.expire, ts.succeedTime DESC
        LIMIT ${start},${count}
    </select>
    
    <select id="countFirstTeam"  resultType="java.lang.Long">

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -424,14 +424,25 @@
        

        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) + " 加入");

			
            if (formatYears.format(todayTime).equals(formatYears.format(inviteTime))) {

                // 本年

                object.put("inviteTime", sdf.format(inviteTime) + " 加入");

            } else {

                // 往年

                object.put("inviteTime", format.format(inviteTime) + " 加入");

            }

			
            

            String nickName = null;

            Long lastLoginTime = null;

@@ -479,7 +490,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 +503,7 @@
                

                JSONArray array2 = new JSONArray();

                array2.add(fontColor2);

                array2.add(days+"天 ");

                array2.add(days+"天");

                

                JSONArray array3 = new JSONArray();

                array3.add(fontColor1);