Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java

@@ -3,6 +3,7 @@
import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;



@@ -28,7 +29,6 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.taobao.DaTaoKeUtil;

import com.yeshi.fanli.vo.dynamic.DynamicClassVO;



import net.sf.json.JSONObject;



@@ -89,36 +89,28 @@
      }



      // Android 返回分类以及顶部数据

      List<DynamicClassVO> list = new ArrayList<DynamicClassVO>();

      DynamicClassVO c1 = new DynamicClassVO();

      c1.setId(1L);

      c1.setName("热销单品");



      List<GoodsClass> listSub = new ArrayList<GoodsClass>();

      listSub.add(new GoodsClass(0L, "今日单品"));

      listSub.addAll(DaTaoKeUtil.goodsClasses);

      c1.setListSub(listSub);



      DynamicClassVO c2 = new DynamicClassVO();

      c2.setId(2L);

      c2.setName("好货推荐");

      c2.setListSub(new ArrayList<GoodsClass>());



      DynamicClassVO c3 = new DynamicClassVO();

      c3.setId(3L);

      c3.setName("有家好店");

      c3.setListSub(new ArrayList<GoodsClass>());



      DynamicClassVO c4 = new DynamicClassVO();

      c4.setId(4L);

      c4.setName("邀请素材");

      c4.setListSub(new ArrayList<GoodsClass>());



      list.add(c1);

      list.add(c2);

      list.add(c3);

      list.add(c4);



		
      GoodsClass menu1 = new GoodsClass(1L, "热销");

      menu1.setListSub(listSub);

		
      GoodsClass menu2 = new GoodsClass(2L, "推荐");

      menu2.setListSub(new ArrayList<GoodsClass>());

		
      GoodsClass menu3 = new GoodsClass(3L, "好店");

      menu3.setListSub(new ArrayList<GoodsClass>());

		
      GoodsClass menu4 = new GoodsClass(4L, "邀请");

      menu4.setListSub(new ArrayList<GoodsClass>());

		
      List<GoodsClass> list = new ArrayList<GoodsClass>();

      list.add(menu1);

      list.add(menu2);

      list.add(menu3);

      list.add(menu4);

		
      JSONObject data = new JSONObject();

      data.put("list", JsonUtil.getApiCommonGson().toJson(list));

      out.print(JsonUtil.loadTrueResult(data));

@@ -193,23 +185,47 @@
            String desc = "";

            if (value != null) {

               // 判断是否是同一天

					
               Calendar calendar = Calendar.getInstance();

               calendar.setTime(value);

               int y1 = calendar.get(Calendar.YEAR);//获取年份

               int d1 = calendar.get(Calendar.DAY_OF_YEAR);//获取年中第几天



               Date nowDate = new Date();

               Calendar calendar2 = Calendar.getInstance();

               calendar2.setTime(nowDate);

               int y2 = calendar2.get(Calendar.YEAR);//获取年份

               int d2 = calendar2.get(Calendar.DAY_OF_YEAR);//获取年中第几天

					
               long old = value.getTime();

               long now = System.currentTimeMillis();

               long oldDay = old / (1000 * 60 * 60 * 24L);

               long nowDay = now / (1000 * 60 * 60 * 24L);

               if (oldDay == nowDay) {// 同一天

                  long cha = now - old;

                  if (cha < 1000 * 60 * 2L)

                     desc = "刚刚";

                  else if (cha < 1000 * 60 * 60L)

                     desc = (cha / (1000 * 60)) + "分钟前";

                  else

                     desc = (cha / (1000 * 60 * 60)) + "小时前";

               } else if (nowDay - oldDay == 1) {

                  desc = "昨天";

               long now = nowDate.getTime();

               if (y1 == y2) {

                  if (d1 == d2) {

                     long cha = now - old;

                     if (cha < 1000 * 60 * 2L) {

                        desc = "刚刚";

                     }else if (cha < 1000 * 60 * 60L) {

                        desc = (cha / (1000 * 60)) + "分钟前";

                     }else {

                        desc = (cha / (1000 * 60 * 60)) + "小时前";

                     }

                  } else if (d2 - d1 == 1) {

                     desc = "昨天";

                  } else {

                     desc = (d2 - d1) + "天前";

                  }

               } else {

                  desc = (nowDay - oldDay) + "天前";

                  int timeDistance = 0;

                  for (int i = y1; i < y2; i++) {

                     if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) {

                        timeDistance += 366; // 闰年

                     } else {

                        timeDistance += 365; // 不是闰年

                     }

                  }

                  desc = timeDistance + (d2 - d1) + "天前";

               }



               return new JsonPrimitive(desc);

            }