From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java | 102 +++++++++++++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java
index 707adc8..d870327 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicController.java
+++ b/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;
@@ -25,10 +26,9 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.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);
}
--
Gitblit v1.8.0