From 220bdea9288ee5b07f124900eb71ac1f56552b55 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:26:30 +0800
Subject: [PATCH] 分享记录

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 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..23f1c80 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();

--
Gitblit v1.8.0