Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -49,6 +49,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.ScanHistoryV2;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

@@ -88,19 +89,19 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

@@ -109,9 +110,9 @@
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -242,7 +243,7 @@
   private TaoBaoShopService taoBaoShopService;



   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private UserMoneyExtraService userMoneyExtraService;

@@ -252,9 +253,6 @@


   @Resource

   private ConfigTaoLiJinService configTaoLiJinService;



   @Resource

   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;



   @Resource

   private DeviceSexService deviceSexService;

@@ -618,7 +616,7 @@


      // 获取淘客参数

      ClientTBPid clientTBPid = null;

      if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {

      if (TaoBaoUtil.isSpecialGoods(simpleGoods.getMaterialLibType())) {

         String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;

         clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

               pid.split("_")[2], pid.split("_")[3]);

@@ -683,11 +681,11 @@


         // taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", taobaoJson);

         String info = configService.get("detail_prompt");

         String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());

         data.put("info", info);

         String onlyInfo = configService.get("only_info");

         String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());

         data.put("only", onlyInfo);

         data.put("helpUrl", configService.get("old_goods_detail_help_url"));

         data.put("helpUrl", configService.get(ConfigKeyEnum.oldGoodsDetailHelpUrl.getKey()));



         int showType = taoBaoGoodsBriefExtra.getShowType();

         String price = "";

@@ -702,7 +700,7 @@
         data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());

         data.put("shareContent", "¥" + price + "元");

         data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());

         String html = configService.get("downAPP");

         String html = configService.get(ConfigKeyEnum.downAPP.getKey());

         data.put("downAPP", html);

         String shareSinaContent = configService.get("shareSinaContent");

         data.put("shareSina",

@@ -1077,7 +1075,7 @@
         return;

      }



      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 6);

      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 6);

      if (goodsList == null)

         goodsList = new ArrayList<>();



@@ -1309,8 +1307,7 @@
       * 

       */

      // if (Constant.IS_OUTNET) {

      String key = "linkParse-" + acceptData.getDevice() + "-" + id;



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.taobaolinkParse, acceptData.getDevice() + "-" + id);

      String value = redisManager.getCommonString(key);

      if (!StringUtil.isNullOrEmpty(value)) {

         out.print(JsonUtil.loadFalseResult(11, "请求频率限制"));

@@ -1419,7 +1416,7 @@
         if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

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



            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);

            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa,"");



            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

               // 筛选

@@ -1431,7 +1428,7 @@
               // filter

               try {



                  gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);

                  gList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(gList);

               } catch (Exception e) {

               }



@@ -1599,7 +1596,8 @@
      if (!StringUtil.isNullOrEmpty(specialCard)) {

         try {



            listswiper = swiperPictureService.getByBannerCard(swiperCard);

            listswiper = swiperPictureService.getByBannerCardAndVersion(swiperCard, acceptData.getPlatform(),

                  Integer.parseInt(acceptData.getVersion()));



            if (listswiper == null) {

               listswiper = new ArrayList<SwiperPicture>();

@@ -1677,7 +1675,7 @@
      JSONObject invite = new JSONObject();

      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");

      invite.put("jumpDetail", jumpDetail);

      invite.put("picture", configService.get("home_invite_banner"));

      invite.put("picture", configService.get(ConfigKeyEnum.homeInviteBanner.getKey()));



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

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

@@ -1719,7 +1717,7 @@
         JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



         // 2、顶部轮播图

         List<SwiperPicture> topPicList = getSwiperByCard("index_top");

         List<SwiperPicture> topPicList = getSwiperByCard("index_top", acceptData);

         if (topPicList == null) {

            topPicList = new ArrayList<SwiperPicture>();

         }

@@ -1731,7 +1729,7 @@
               && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            // 如果IOS当前版本处于审核状态就不返回

         } else {

            invitePicList = getSwiperByCard("index_invite");

            invitePicList = getSwiperByCard("index_invite", acceptData);

         }



         if (invitePicList == null) {

@@ -1742,7 +1740,7 @@
         // 4、IOS的底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

            root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));

         }



         root.put("spikeGoods", getSpikeGoodsContent(acceptData));

@@ -1772,15 +1770,16 @@
         return null;

      }



      List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");

      List<SwiperPicture> invitePicList = getSwiperByCard("index_invite", acceptData);



      return invitePicList;

   }



   public List<SwiperPicture> getSwiperByCard(String card) {

   public List<SwiperPicture> getSwiperByCard(String card, AcceptData acceptData) {

      List<SwiperPicture> swiperList = null;

      try {

         swiperList = swiperPictureService.getByBannerCard(card);

         swiperList = swiperPictureService.getByBannerCardAndVersion(card, acceptData.getPlatform(),

               Integer.parseInt(acceptData.getVersion()));

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

@@ -1829,8 +1828,8 @@
      nextTime.set(Calendar.MILLISECOND, 0);



      JSONArray array = null;

      String timekey = String.format("spikeGoods_hour-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      String cachekey = String.format("spikeGoodsList-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      String timekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsHour,acceptData.getPlatform() +"-"+acceptData.getVersion());

      String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsList,acceptData.getPlatform() +"-"+acceptData.getVersion());



      String timeValue = redisManager.getCommonString(timekey);

      if (timeValue == null || !timeValue.equals(hour + "")) {

@@ -1867,7 +1866,7 @@
                  .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

            goods.put("jumpDetail", jumpDetail);

            JSONObject params = new JSONObject();

            params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());

            params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());

            goods.put("params", params);



            // 1.5.4及以后返回

@@ -1889,7 +1888,7 @@
      root.put("listgoods", array);



      JSONObject params = new JSONObject();

      params.put("url", configService.get("spike_goods_link"));

      params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));



      root.put("params", params);

      root.put("jumpDetail", jumpDetail);

@@ -2075,7 +2074,7 @@


      // 大淘客商品过滤

      try {

         goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);

         goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }

@@ -2254,7 +2253,7 @@
      data.put("shareUrl", shareUrl);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

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

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



      String noRebateHelpLink = null;



@@ -2346,7 +2345,7 @@
         }



      } else if (from != null && from.equals("taolijin_buy")) {

         noRebateHelpLink = configService.get("zigoulijian_nofanli_help");

         noRebateHelpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());

         // 查询分享库

         TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),

               TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

@@ -2375,7 +2374,7 @@
      if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {

         data.put("noRebateHelpLink", noRebateHelpLink);

      } else {

         data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));

         data.put("noRebateHelpLink", configService.get(ConfigKeyEnum.noRebateHelpLink.getKey()));

      }



      // 取消分享活动

@@ -2471,7 +2470,7 @@


      try {



         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);

         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 10);

         // 初始化

         if (goodsList == null) {

            goodsList = new ArrayList<TaoBaoGoodsBrief>();

@@ -2556,9 +2555,8 @@
    */

   @RequestMapping(value = "getSpecialActivities")

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

      int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

      List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",

            platformCode, Integer.parseInt(acceptData.getVersion()));

            acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



      List<Special> list = new ArrayList<Special>();

      if (listSpecial != null) {

@@ -2577,18 +2575,6 @@
         String name = special.getName();

         if (StringUtil.isNullOrEmpty(name)) {

            continue;

         }



         // 是否需要弹出框

         if (name.equals("账户等级特权")) {

            if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

               list.remove(i);

               i--;

            } else {

               if (uid != null) {

                  special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));

               }

            }

         }

      }