From f005fc9eb911b3dc543e9069053323cc8f70201d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 13:03:42 +0800
Subject: [PATCH] 增加小米推送注册regId服务，暂时取消推送时的消息免打扰过滤
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 8919cf3..13ca73e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
@@ -18,7 +19,12 @@
import org.yeshi.utils.taobao.TbImgUtil;
import com.fasterxml.jackson.core.util.VersionUtil;
+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.controller.client.v2.ShareControllerV2;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -507,16 +513,28 @@
List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();
long count = userShareGoodsRecordService.countQueryByUid(uid, source);
-
if (count > 0) {
list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);
}
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
+ }
+ }
+ });
+ Gson gson = gsonBuilder.create();
+
data.put("count", count);
- data.put("result_list",
- JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create().toJson(list));
+ data.put("result_list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
e.printStackTrace();
@@ -1082,10 +1100,7 @@
data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
- String inviteCode = null;
- UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
- if (extra != null)
- inviteCode = extra.getInviteCode();
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
// 娴嬭瘯
List<String> commentTexts = new ArrayList<>();
String commentTextStr = configService.get("share_single_goods_comment_text");
@@ -1111,11 +1126,8 @@
} else if (cid == 4) { // 閭�璇峰垎浜�
- String inviteCode = null;
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- inviteCode = userInfoExtra.getInviteCode();
- } else {
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
out.print(JsonUtil.loadFalseResult(9001, "閭�璇风爜鏈縺娲�"));
return;
}
--
Gitblit v1.8.0