Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -14,9 +14,8 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONObject;

@@ -61,8 +60,7 @@
         out.print(JsonUtil.loadFalseResult(1, "暂不开放申请"));

         return;

      }



      //

		
      UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);

      if ("share".equalsIgnoreCase(source)) {

         if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {

@@ -70,15 +68,15 @@
            return;

         }



      } else {

      } else if ("zigou".equalsIgnoreCase(source)) {

         if (user != null && !StringUtil.isNullOrEmpty(user.getSpecialId()) && user.getSpecialValid()) {

            out.print(JsonUtil.loadFalseResult(1, "无需授权"));

            return;

         }

      }



      String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(Constant.TAOBAO_AUTH_APPKEY,

            "http://test.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);

      String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,

            "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);



      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)}";

@@ -95,6 +93,11 @@
      if (first)

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

      else

         out.print(JsonUtil.loadTrue(0, data, "绑定淘宝失败"));

         out.print(JsonUtil.loadTrue(0, data, "淘宝授权未成功，请稍后再试"));

   }

	
}