冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

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

@@ -14,9 +14,6 @@
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

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

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

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

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

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

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

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

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

@@ -96,6 +93,12 @@
      // 领券帮助链接,1.5.2后生效

      String couponHelp = configService.get("taobao_coupon_help");

      data.put("couponHelpUrl", couponHelp);

		
      // 底部网页链接

      String platform = acceptData.getPlatform();

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

         data.put("htmlLink", configService.get("index_html_link_android"));

      }



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

   }

@@ -109,25 +112,9 @@


      ClientTBPid clientTBPid = null;

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

         TBPid tbPid = tbPidService.getTBPid(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();

      } else {

         TBPid tbPid = tbPidService.getTBPid(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();

      }



      String cartJS = configService.get("taobao_cart_js");