From ed390c70bfbafb399fe20e8b89efc02ca5be008d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 15:32:40 +0800
Subject: [PATCH] config
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 c4eab0d..30e7e26 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
@@ -592,8 +592,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -605,7 +604,7 @@
}
/**
- * 浜笢
+ * 鎷煎澶�
*
* @param kw
* @param page
@@ -669,7 +668,7 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate,
shareRate);
array.add(gson.toJson(goodsDetailVO));
}
--
Gitblit v1.8.0