Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;

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

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.config.ConfigService;

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

@@ -161,8 +162,8 @@
    * @param acceptData

    * @param out

    */

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

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

   @RequestMapping(value = "getHomeConfigNew")

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

      if (uid != null && uid == 0L)

         uid = null;



@@ -178,7 +179,9 @@
         FloatAD floatAD = listAD.get(i);

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack

               && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) {

               && (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())

                     || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {



            listAD.remove(i);

            i--;

            continue;

@@ -228,7 +231,10 @@
      String platform = acceptData.getPlatform();

      data.put("hotFuctionLink",

            configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));

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

      if (StringUtil.isNullOrEmpty(callback))

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

      else

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

   }



   /**

@@ -523,4 +529,19 @@
         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

   }



   /**

    * 获取饿了么的推广链接

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "userProtocolListen")

   public void userProtocolListen(AcceptData acceptData, Long uid, int type, PrintWriter out) {

      LogHelper.userProtocolListen(String.format("%s#%s#%s", acceptData.getDevice(), uid, type));

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

		
		
   }



}