Merge remote-tracking branch 'origin/master'

admin

2019-04-17 70a0aed5a22fbdbb486351258535944b5dae2a79

 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java

@@ -82,7 +82,10 @@
         String openUid = data.optString("taobao_open_uid");

         String taoBaoUid = data.optString("taobao_user_id");

         String nickName = data.optString("taobao_user_nick");



         try {

            nickName = URLDecoder.decode(nickName, "UTF-8");

         } catch (Exception e) {

         }

         // LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);



         // 获取渠道ID与会员ID

@@ -92,15 +95,15 @@
            if (StringUtil.isNullOrEmpty(relationId))

               LogHelper.test(uid + "渠道备案失败");

            try {

               userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid,nickName, true);

               userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, nickName, true);

            } catch (UserExtraTaoBaoInfoException e) {

               LogHelper.test(e.getMsg());

               errCode = 5;

            }

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

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

            String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                  TaoBaoConstant.TAOBAO_AUTH_APPSECRET);




            if (StringUtil.isNullOrEmpty(specialId))

               LogHelper.test(uid + "会员备案失败");

            try {

@@ -110,17 +113,18 @@
               errCode = 5;

            }

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

				


            boolean bindInfo = true;

            // 绑定淘宝：V1.5.3

            String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 渠道ID

            String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,

                  TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 渠道ID

            if (StringUtil.isNullOrEmpty(relationId)) {

               LogHelper.test(uid + "渠道备案失败");

               bindInfo = false;

            } 
				
            }



            String specialId = null;

            if(bindInfo) {

            if (bindInfo) {

               specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,

                     TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

               if (StringUtil.isNullOrEmpty(specialId)) {

@@ -128,20 +132,20 @@
                  bindInfo = false;

               }

            }

				


            if (!bindInfo) {

               errCode = 5;// 信息获取不全

            } else {

               try {

                  userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName, true);

                  userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName,

                        true);

               } catch (UserExtraTaoBaoInfoException e) {

                  LogHelper.test(e.getMsg());

                  errCode = 6;

               }

            }

				


         }

				


         if (!StringUtil.isNullOrEmpty(nickName))

            try {

@@ -156,7 +160,7 @@
         record.setTaoBaoUserNick(nickName);

         record.setCreateTime(new Date());

         taoBaoUnionAuthRecordService.addAuthRecord(record);

			


      } catch (Exception e) {

         errCode = 4;

         try {