From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index aa9fe59..9de8ac9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -2,9 +2,11 @@
import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -16,9 +18,19 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.BigDecimalUtil;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.IPUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
@@ -76,11 +88,6 @@
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -456,9 +463,7 @@
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new_online.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
else
-
- data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
- Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
+ data.put("inviteList", configService.get("team_list"));
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = user;
ThreadUtil.run(new Runnable() {
@@ -1429,9 +1434,10 @@
}
}
-
+
/**
* h5鏀惰棌
+ *
* @param callback
* @param acceptData
* @param uid
@@ -1439,26 +1445,26 @@
* @param out
*/
@RequestMapping("collectionGoodsJp")
- public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
-
+ public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
+
if (uid == null || auctionId == null) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult(""));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(""));
return;
}
-
+
CollectionGoods find = collectionGoodsService.findByUidAndAuctionId(uid, auctionId);
-
+
if (find == null) {
// 娣诲姞鏀惰棌
CollectionGoods cg = TaoBaoUtil.getCollectionGoods(auctionId, new UserInfo(uid));
collectionGoodsService.save(cg);
- JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(1));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(1));
} else {
// 鍙栨秷鏀惰棌
collectionGoodsService.delete(find);
- JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(0));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(0));
}
-
+
}
@RequestMapping("collectionGoodsList")
@@ -1475,12 +1481,23 @@
goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
fcRate, "");
+ taoBaoGoodsBriefExtra.setCreatetime(new Date(cg.getCreateTime()));
list.add(taoBaoGoodsBriefExtra);
});
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().create();
+ GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(builder).excludeFieldsWithoutExposeAnnotation()
+ .create();
data.put("list", gson.toJson(list));
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0