Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

 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;

@@ -21,16 +22,16 @@
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.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.goods.CollectionGoodsV2;

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.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;

import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;

@@ -72,7 +73,7 @@
   private RedisManager redisManager;



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;

@@ -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, "请上传id"));

         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) {

@@ -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));