Merge branch 'div'

yujian

2019-04-12 d1b7fd85615a78a476650e5acfc8b165a5deb3aa

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

@@ -14,14 +14,11 @@
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;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



@@ -47,8 +44,8 @@
   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

   private CommonOrderCountService commonOrderCountService;

	
   private UserInfoExtraService userInfoExtraService;



   @Resource

   private FloatADService floatADService;

   

@@ -86,7 +83,8 @@
         detail.put("showTime", floatAD.getShowMode());

         detail.put("accountLogin", floatAD.isJumpNeedLogin());

         

         if (uid != null && !commonOrderCountService.hasRebateAndShareOrder(uid)) {

         if (uid != null && userInfoExtraService.isNewUser(uid)) {

            // 新用户

            data.put("floatImgDetail", detail);

         } else {

            data.put("floatImgDetail", detail);

@@ -96,6 +94,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));

   }

@@ -169,4 +173,21 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



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

   public void getUserConfig(AcceptData acceptData, PrintWriter out) {

      try {

         // 用户协议链接

         String serviceProtocol = configService.get("service_protocol_link");

         // 隐私条款链接

         String privacyProtocol = configService.get("privacy_protocol_link");

         JSONObject data = new JSONObject();

         data.put("serviceProtocolLink", serviceProtocol);

         data.put("privacyProtocolLink", privacyProtocol);

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

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));

         e.printStackTrace();

      }

		
   }

}