删除了部分残余代码

admin

2019-03-20 435bed78efa8ab34bbf456ef55eb586ccfc113f1

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

@@ -79,7 +79,6 @@
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;

@@ -128,11 +127,7 @@
   private SuperRecommendBannerService superRecommendBannerService;



   @Resource

   private SuperRecommendSectionService superRecommendSectionService;



   @Resource

   private SuperRecommendSpecialService superRecommendSpecialService;





   @Resource

   private OrderService orderService;

@@ -227,10 +222,10 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;





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

@@ -397,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, "系统不存在"));

@@ -439,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, "系统不存在"));

@@ -477,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, "系统不存在"));

@@ -544,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, "系统不存在"));

@@ -697,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, "系统不存在"));

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



@@ -1000,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 {

@@ -1064,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;

@@ -1190,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;

@@ -1235,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, "系统不存在"));

@@ -1400,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;

@@ -1507,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;

@@ -1645,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;

@@ -1675,32 +1638,10 @@


      } 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();

         }

      }



@@ -1945,7 +1886,7 @@
      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() + ""));



@@ -2043,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;

@@ -2134,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;