admin
2019-03-19 2019c99e41c1d5a58afb00c4291f7e8451004ddd
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
@@ -3,7 +3,6 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -23,15 +22,14 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
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.system.BusinessSystem;
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.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
@@ -39,7 +37,6 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -73,7 +70,7 @@
   private RedisManager redisManager;
   @Resource
   private SystemService systemService;
   private BusinessSystemService businessSystemService;
   @Resource
   private CollectionGoodsV2Service collectionGoodsV2Service;
@@ -86,9 +83,6 @@
   @Resource
   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
   @Resource
   private ScanHistoryService scanHistoryService;
   @Resource
   private TaoBaoUnionConfigService taoBaoUnionConfigService;
@@ -104,7 +98,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));
@@ -157,7 +151,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;
@@ -252,10 +246,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) {
@@ -324,23 +318,6 @@
         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
         final TaoBaoGoodsBrief tbb=tb;
         ThreadUtil.run(new Runnable() {
            public void run() {
               // 添加浏览记录
               ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);
               sh.setDevice(acceptData.getDevice());
               sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
               sh.setCreatetime(new Date());
               if (uid != null && !uid.equals("")) {
                  sh.setUid(Long.parseLong(uid));
               }
               try {
                  scanHistoryService.addScanHistory(sh);
               } catch (Exception e) {
                  e.printStackTrace();
               }
            }
         });
      } else {
         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));