From 23ef24418b0091ffd4060985cf6eba6a73f6042c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 六月 2019 15:48:34 +0800
Subject: [PATCH] 修改详情返回价格的数据格式

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 6376ac2..c545e78 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -92,6 +92,7 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.user.ShamUserService;
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
@@ -99,6 +100,7 @@
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
@@ -224,6 +226,9 @@
 
 	@Resource
 	private TaoBaoShopService taoBaoShopService;
+
+	@Resource
+	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
 	@RequestMapping(value = "getHonestList")
 	public void getHonestList(AcceptData acceptData, PrintWriter out) {
@@ -1688,8 +1693,8 @@
 		nextTime.set(Calendar.MILLISECOND, 0);
 
 		JSONArray array = null;
-		String timekey = String.format("spikeGoods_hour-%s-%s",acceptData.getPlatform(),acceptData.getVersion());
-		String cachekey = String.format("spikeGoodsList-%s-%s",acceptData.getPlatform(),acceptData.getVersion());
+		String timekey = String.format("spikeGoods_hour-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
+		String cachekey = String.format("spikeGoodsList-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
 
 		String timeValue = redisManager.getCommonString(timekey);
 		if (timeValue == null || !timeValue.equals(hour + "")) {
@@ -1936,13 +1941,19 @@
 		if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
 			finalImgList.add(0, tb.getPictUrlWhite());
 
+		// 澶ф窐瀹㈠晢鍝佽繃婊�
+		try {
+			goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+		}
 		JSONObject goodsJson = new JSONObject();
 		goodsJson.put("auctionId", tb.getAuctionId());
 		goodsJson.put("imgList", finalImgList);
 		goodsJson.put("title", tb.getTitle());
 		goodsJson.put("userType", tb.getUserType() == 1 ? 2 : 1);
 		goodsJson.put("price", tb.getReservePrice().toString());
-		goodsJson.put("zkPrice", tb.getZkPrice().toString());
+		goodsJson.put("zkPrice", MoneyBigDecimalUtil.getWithNoZera(tb.getZkPrice()).toString());
 
 		// 30澶╅攢閲�
 		goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1991,7 +2002,7 @@
 		if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
 			BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
 			JSONObject couponInfo = new JSONObject();
-			couponInfo.put("couponPrice", quanPrice.toString());
+			couponInfo.put("couponPrice", MoneyBigDecimalUtil.getWithNoZera(quanPrice).toString());
 
 			if (from != null && from.equals("miandan")) {
 				// 鍏嶅崟鍟嗗搧
@@ -2018,7 +2029,7 @@
 			// tb.getAuctionId() + ""));
 			// }
 
-			couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
+			couponInfo.put("couponAmount", MoneyBigDecimalUtil.getWithNoZera(tb.getCouponAmount()).toString());
 			couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
 					+ tb.getCouponEffectiveEndTime().replace("-", "."));
 			// 鍒哥殑鍙d护

--
Gitblit v1.8.0