From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 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..ae32280 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,17 +22,17 @@
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.system.System;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
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;
@@ -72,10 +73,10 @@
private RedisManager redisManager;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private ConfigService configService;
@@ -103,7 +104,7 @@
@RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)
public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {
- System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
+ BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));
@@ -156,7 +157,7 @@
@RequestMapping(value = "getRecommendSection", method = RequestMethod.GET)
public void getRecommendSection(AcceptData acceptData, String callback, PrintWriter out) {
- System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
+ BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));
return;
@@ -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);
}
@@ -253,10 +252,10 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- System system = webControllerUtil.getSystem(acceptData);
+ BusinessSystem system = webControllerUtil.getSystem(acceptData);
// 娣樼壒浠�
if (system.getId() == 7) {
- system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
+ system = businessSystemService.getBusinessSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
}
if (system == null) {
@@ -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);
}
@@ -330,7 +329,7 @@
// 娣诲姞娴忚璁板綍
ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);
sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
+ sh.setSystem(businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages()));
sh.setCreatetime(new Date());
if (uid != null && !uid.equals("")) {
sh.setUid(Long.parseLong(uid));
--
Gitblit v1.8.0