删除了部分残余代码

admin

2019-03-20 435bed78efa8ab34bbf456ef55eb586ccfc113f1

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -36,12 +36,9 @@
import com.yeshi.fanli.entity.bus.recommend.Honest;

import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;

import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;

import com.yeshi.fanli.entity.bus.recommend.RecommendSection;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.ShamUser;

@@ -79,11 +76,9 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

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

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

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

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

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

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

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

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

@@ -98,7 +93,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.ShareManageService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

@@ -109,7 +103,6 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

@@ -134,22 +127,13 @@
   private SuperRecommendBannerService superRecommendBannerService;



   @Resource

   private SuperRecommendSectionService superRecommendSectionService;



   @Resource

   private SuperRecommendSpecialService superRecommendSpecialService;



   @Resource

   private RecommendSectionGoodsService recommendSectionGoodsService;



   @Resource

   private OrderService orderService;



   @Resource

   private ScanHistoryV2Service scanHistoryV2Service;



   @Resource

   private ShareManageService shareManageService;



   @Resource

   private ConfigService configService;

@@ -238,92 +222,10 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {



      if (index < 0) {

         index = 0;

      }



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }

      List<SuperRecommendSection> superRecommendSectionList = superRecommendSectionService

            .getSuperRecommendSectionBySystemId(system.getId());

      List<RecommendSection> recommendSectionList = null;

      for (SuperRecommendSection superRecommendSection : superRecommendSectionList) {

         if (recommendSectionList == null) {

            recommendSectionList = new ArrayList<RecommendSection>();

         }

         RecommendSection recommendSection = superRecommendSection.getRecommendSection();



         // 暂时改变淘特价的跳转地址

         if (system.getId() == 7) {

            recommendSection.setJumpUrl(recommendSection.getJumpUrl().replace("column.html", "column_ttj.html"));

         }



         recommendSectionList.add(recommendSection);

      }

      if (recommendSectionList == null) {

         out.print(JsonUtil.loadFalseResult(1, "暂无数据"));

         return;

      }

      Utils.sort(recommendSectionList);

      int size = recommendSectionList.size();



      List<RecommendSectionGoods> recommendSectionGoodsList = null;

      JSONObject data = new JSONObject();

      data.put("count", size);

      JSONArray dataArr = new JSONArray();

      JSONObject validData = null;

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

      BigDecimal proportion = manageService.getFanLiRate();

      Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();

      for (int i = 0; i < size; i++) {

         validData = new JSONObject();

         RecommendSection recommendSection = recommendSectionList.get(i);

         recommendSectionGoodsList = map.get(recommendSection.getId());

         if (recommendSectionGoodsList == null) {

            continue;

         }

         Utils.sort(recommendSectionGoodsList);

         if (recommendSection.getCounts() < recommendSectionGoodsList.size()) {

            recommendSectionGoodsList = recommendSectionGoodsList.subList(0, recommendSection.getCounts());

         }

         validData.put("count", recommendSectionGoodsList.size());

         validData.put("recommendSection", gson.toJson(recommendSection));



         // 替换TaoBaoGoodsBrief

         JSONArray array = new JSONArray();

         Gson gson2 = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();

         for (RecommendSectionGoods rss : recommendSectionGoodsList) {

            JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));

            String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(

                  gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),

                  proportion.toString(), ""));

            obj.put("taoBaoGoodsBrief", json);

            array.add(obj);

         }



         validData.put("recommendSectionGoodsList", array);

         dataArr.add(validData);

      }

      data.put("data", dataArr);



      String result = JsonUtil.loadTrueResult(data);

      if (Constant.IS_OUTNET)

         redisManager.cacheCommonString("client-api-getRecommendSection", result, 3 * 60);



      out.print(result);

      return;

   }



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      List<Honest> honestList = null;

      List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

      if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))

@@ -490,7 +392,8 @@
   @RequestMapping(value = "getrecommendspecial")

   public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());



      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -532,7 +435,8 @@
   @RequestMapping(value = "guessLike", method = RequestMethod.POST)

   public void guessLike(AcceptData acceptData, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());



      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -570,7 +474,8 @@
   @RequestMapping(value = "getrecommendbanner")

   public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      JSONObject json = new JSONObject();

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -637,7 +542,8 @@
         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

         return;

      }

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());



      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -673,7 +579,7 @@
            clientTBPid = tbPidService.getIOSDefault();

         }

      }

		


      TaoBaoGoodsBrief tb = null;

      try {

         TaoKeAppInfo app = new TaoKeAppInfo();

@@ -774,11 +680,6 @@


      } else {

         out.print(JsonUtil.loadFalseResult(2, "商品已下架"));

         ThreadUtil.run(new Runnable() {

            public void run() {

               recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(Long.parseLong(id));

            }

         });

      }

      long end = java.lang.System.currentTimeMillis();

      java.lang.System.out.println("耗时:" + (end - begin));

@@ -795,7 +696,8 @@
         out.print(JsonUtil.loadFalseResult(1, "请上传id"));

         return;

      }

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());



      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -814,38 +716,11 @@
      // 获取淘客参数

      ClientTBPid clientTBPid = null;

      // 用户已经登录

      if (!StringUtil.isNullOrEmpty(uid)) {

         TBPid tbPid = null;

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

            if (tbPid != null) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getAndroidDefault();

            }



         } else {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

            if (tbPid != null) {



               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getIOSDefault();

            }

         }



      } else {

         if (acceptData.getPlatform().equalsIgnoreCase("android"))

            clientTBPid = tbPidService.getAndroidDefault();

         else

            clientTBPid = tbPidService.getIOSDefault();

      }

      if (acceptData.getPlatform().equalsIgnoreCase("android"))

         clientTBPid = tbPidService.getAndroidDefault();

      else

         clientTBPid = tbPidService.getIOSDefault();



      LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));



@@ -1098,25 +973,9 @@
      if (!StringUtil.isNullOrEmpty(uid)) {

         TBPid tbPid = null;

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

            if (tbPid != null) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getAndroidDefault();

            }

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

            if (tbPid != null) {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            } else {

               clientTBPid = tbPidService.getIOSDefault();

            }

            clientTBPid = tbPidService.getIOSDefault();

         }



      } else {

@@ -1162,7 +1021,8 @@
   // 根据商品获取推荐

   @RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)

   public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

@@ -1198,16 +1058,6 @@
                        goodsList.add(gds);

                  }

            }

         }



         // 需要另做推荐

         if (goodsList.size() < 6) {

            List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);

            if (list != null)

               for (int i = 0; i < list.size(); i++) {

                  if (goodsList.size() < 6)

                     goodsList.add(list.get(i).getTaoBaoGoodsBrief());

               }

         }

      }



@@ -1298,7 +1148,8 @@
         return;

      }

      page = page + 1;

      BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),

            acceptData.getPackages());

      if (sys == null) {

         out.print(JsonUtil.loadFalseResult(1, "不存在该系统"));

         return;

@@ -1343,7 +1194,8 @@


   @RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)

   public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {

      BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),

            acceptData.getPackages());



      if (sys == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

@@ -1508,7 +1360,8 @@
   @RequestMapping(value = "getRecommendInfo")

   public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

@@ -1615,7 +1468,8 @@
   public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

         PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

@@ -1753,7 +1607,8 @@
         return;

      }



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

@@ -1782,34 +1637,11 @@
         }



      } else {



         // 用户已经登录

         TBPid tbPid = null;

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {



            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);



            if (tbPid == null) {

               clientTBPid = tbPidService.getAndroidDefault();

            } else {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }



            clientTBPid = tbPidService.getAndroidDefault();

         } else {



            tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);



            if (tbPid == null) {

               clientTBPid = tbPidService.getIOSDefault();

            } else {

               String siteId = tbPid.getPid().split("_")[2];

               String adzoneId = tbPid.getPid().split("_")[3];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

               clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }

            clientTBPid = tbPidService.getIOSDefault();

         }

      }



@@ -1894,6 +1726,7 @@
      TaoBaoGoodsBrief tb = null;

      if (goodsList.size() > 0) {

         tb = goodsList.get(0);



      }



      if (tb == null) {

@@ -1973,6 +1806,12 @@
            hongBao = "¥" + quanPrice.toString();

         }



         String token = "";

         if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {

            token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());

            tb.setCouponLinkTaoToken(token);

         }



         // 服务端转链

         if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

            couponInfo.put("couponUrl", tb.getCouponLink());

@@ -1984,6 +1823,8 @@
         couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));

         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

               + tb.getCouponEffectiveEndTime().replace("-", "."));

         // 券的口令

         couponInfo.put("couponToken", token);

         goods.put("couponInfo", couponInfo);



         if (tb.getBiz30day() >= 1000) {

@@ -2040,10 +1881,14 @@


      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);



      data.put("goods", goods);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);

      // 商品链接

      data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));



      // 取消分享活动

      // if (!StringUtil.isNullOrEmpty(uid)

@@ -2139,7 +1984,8 @@
   @RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)

   public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

@@ -2230,7 +2076,8 @@
   @RequestMapping(value = "getSpecialActivities")

   public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;