小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -88,19 +88,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.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,7 +109,6 @@
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.RedisManager;

@@ -252,9 +251,6 @@


   @Resource

   private ConfigTaoLiJinService configTaoLiJinService;



   @Resource

   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;



   @Resource

   private DeviceSexService deviceSexService;

@@ -618,7 +614,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]);

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

      }



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

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

      if (goodsList == null)

         goodsList = new ArrayList<>();



@@ -1356,6 +1352,13 @@
      if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {

         List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),

               imei, idfa, page);



         if (page < 4) {// 前三页加入更新

            try {

               taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);

            } catch (Exception e) {

            }

         }



         BigDecimal rate = hongBaoManageService.getFanLiRate();

         for (TaoBaoGoodsBrief goods : goodsList) {

@@ -2178,6 +2181,8 @@
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         if ("taolijin".equalsIgnoreCase(from))

            proportion = manageService.getTLJShareRate(System.currentTimeMillis());

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goodsJson.put("hongBao", hongBao);

@@ -2266,7 +2271,7 @@
      // 推广红包

      if (from != null && from.equals("taolijin")) {

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

         String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);



         // 推广红包 不能小于1

@@ -2325,7 +2330,7 @@
            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());

         }



         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");

         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", null);



         if (Constant.IS_TEST) {

            fanliValid = true;

@@ -2462,7 +2467,7 @@


      try {



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

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

         // 初始化

         if (goodsList == null) {

            goodsList = new ArrayList<TaoBaoGoodsBrief>();

@@ -2546,61 +2551,36 @@
    * @param out

    */

   @RequestMapping(value = "getSpecialActivities")

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

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



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

            acceptData.getPackages());

      if (system == null) {

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

         return;

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

      if (listSpecial != null) {

         list.addAll(listSpecial);

      }



      try {

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

         Special special = list.get(i);



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

         // 专题活动

         String specialCard = "special_activities";



         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

               system.getId());



         if (listSpecial != null) {

            list.addAll(listSpecial);

         JumpDetailV2 jumpDetail = special.getJumpDetail();

         if (jumpDetail != null) {

            jumpDetail.setNeedLogin(special.isJumpLogin());

            special.setJumpDetail(jumpDetail);

         }



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

            Special special = list.get(i);



            JumpDetailV2 jumpDetail = special.getJumpDetail();

            if (jumpDetail != null) {

               jumpDetail.setNeedLogin(special.isJumpLogin());

               special.setJumpDetail(jumpDetail);

            }



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

                  }

               }

            }

         String name = special.getName();

         if (StringUtil.isNullOrEmpty(name)) {

            continue;

         }

      }



         JSONObject root = new JSONObject();

         root.put("special", JsonUtil.getApiCommonGson().toJson(list));

      JSONObject root = new JSONObject();

      root.put("special", JsonUtil.getApiCommonGson().toJson(list));

      if (StringUtil.isNullOrEmpty(callback))

         out.print(JsonUtil.loadTrueResult(root));



      } catch (Exception e) {

         e.printStackTrace();

      }

      else

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(root));

   }

}