From 665086339b528ebf2c101549bd0d9c8ef957f411 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 10:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
index eef0f2a..bb1d7fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.web;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -11,6 +12,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -20,7 +22,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
-import com.yeshi.fanli.entity.bus.user.CollectionGoods;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -30,7 +32,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
@@ -44,7 +46,6 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -75,7 +76,7 @@
private SystemService systemService;
@Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private ConfigService configService;
@@ -190,9 +191,7 @@
JSONArray dataArr = new JSONArray();
JSONObject validData = null;
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- String fcRate = convertMap.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
for (int i = 0; i < size; i++) {
@@ -216,7 +215,7 @@
JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion, fcRate, ""));
+ proportion.toString(), ""));
obj.put("taoBaoGoodsBrief", json);
array.add(obj);
}
@@ -290,7 +289,7 @@
taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
if (uid != null && !"".equals(uid.trim())) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collection", collectionGoods != null ? true : false);
}
--
Gitblit v1.8.0