From 4f29967f7eb1817ddd0eb631d95547c74e1877c6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 09:24:36 +0800
Subject: [PATCH] 奖励券使用加入订单类型区分

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index d95cde7..ee7f93d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -45,6 +45,7 @@
 import com.yeshi.fanli.service.inter.user.HistorySearchService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.GsonUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.Utils;
@@ -688,12 +689,11 @@
 			if (goodsList != null && goodsList.size() > 0) {
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
-				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+		
 				for (PDDGoodsDetail goods : goodsList) {
 					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
 							shareRate);
-					array.add(gson.toJson(goodsDetailVO));
+					array.add(GsonUtil.toJsonExpose(goodsDetailVO));
 				}
 			}
 		}

--
Gitblit v1.8.0