1.5.7版本需求

admin

2019-07-09 531d93708df8017e59830f15b41f3cc42d6126e6

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

@@ -16,6 +16,7 @@
import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;

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

import com.yeshi.fanli.entity.config.AppHomeFloatImg;

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

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

@@ -26,6 +27,7 @@
import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -71,7 +73,8 @@
   @Resource

   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;



	
   @Resource

   private UserActiveLogService userActiveLogService;

   

   /**

    * 首页配置信息

@@ -105,7 +108,8 @@
               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);

            }

         } else {

            UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name());

            UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid,

                  TaoLiJinOriginEnum.newbiesWin.name());

            if (userTaoLiJin == null) {

               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);

            }

@@ -137,12 +141,23 @@
         data.put("htmlLink", configService.get("index_html_link_android"));

      }



      // 判断新老用户

      UserActiveLog da = null;

      if (uid != null)

         da = userActiveLogService.getFirstActiveInfo(uid);

      // 新人

      if (da == null || (System.currentTimeMillis() - da.getCreateTime().getTime()) <= 1000 * 60 * 60 * 24 * 15L) {

         data.put("userTimeType", 0);

      } else {// 老人

         data.put("userTimeType", 1);

      }

      data.put("hotFuctionLink", configService.get("hot_function_url"));

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

   }



	
   /**

    * 消息中心弹框

    * 
    * @param acceptData

    * @param uid

    * @param out

@@ -169,7 +184,6 @@
      }

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

   }

	
   

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

   public void getTaoBaoCartConfig(AcceptData acceptData, String position, Long uid, PrintWriter out) {