admin
2019-05-20 94e043b0d3fabe60dabce6df28b2ee6a1df7114e
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -48,8 +48,7 @@
   @Resource
   private FloatADService floatADService;
   /**
    * 首页配置信息
    * 
@@ -62,18 +61,18 @@
      if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
         appHomeFloatImg = null;
      }
      JSONObject data = new JSONObject();
      if (appHomeFloatImg != null) {
         data.put("floatImg", appHomeFloatImg);
      }
      String notifyImg = configService.getAppHomeFloatNotifyImg();
      if (!StringUtil.isNullOrEmpty(notifyImg)) {
         data.put("floatNotifyImg", notifyImg);
      }
      // 悬浮大图 1.5.2  -2019.3.20
      // 悬浮大图 1.5.2 -2019.3.20
      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX);
      if (floatAD != null) {
         JSONObject detail = new JSONObject();
@@ -82,7 +81,7 @@
         detail.put("params", floatAD.getParams());
         detail.put("showTime", floatAD.getShowMode());
         detail.put("accountLogin", floatAD.isJumpNeedLogin());
         if (uid != null && userInfoExtraService.isNewUser(uid)) {
            // 新用户
            data.put("floatImgDetail", detail);
@@ -90,11 +89,11 @@
            data.put("floatImgDetail", detail);
         }
      }
      // 领券帮助链接,1.5.2后生效
      String couponHelp = configService.get("taobao_coupon_help");
      data.put("couponHelpUrl", couponHelp);
      // 底部网页链接
      String platform = acceptData.getPlatform();
      if ("android".equalsIgnoreCase(platform)) {
@@ -188,24 +187,24 @@
         out.print(JsonUtil.loadFalseResult("获取失败"));
         e.printStackTrace();
      }
   }
   /**
    * 订单解析配置
    *
    * @param acceptData
    * @param out
    */
   @RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
   public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
      String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');";
      orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}";
      String orderJS = configService.get("taobao_order_parse_js");
      JSONObject data = new JSONObject();
      try {
         data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
               StringUtil.getBase64String("*M#34f?,")));
         data.put("orderUrl", DESUtil.encode( "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",StringUtil.getBase64String("YeShiFANLI889*+"),
               StringUtil.getBase64String("*M#34f?,")));
         data.put("orderUrl", DESUtil.encode("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",
               StringUtil.getBase64String("YeShiFANLI889*+"), StringUtil.getBase64String("*M#34f?,")));
      } catch (Exception e) {
         e.printStackTrace();
      }