冲突

yujian

2019-03-06 a6673284d4ec0b7c11079c65d940c9443d86d11e

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

@@ -11,6 +11,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

@@ -18,11 +19,13 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;

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

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

@@ -49,6 +52,9 @@
   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Resource

   private UserInfoService userInfoService;



   /**

    * 获取淘宝的分享链接

    * 

@@ -66,6 +72,12 @@
         return;

      }



      UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

      if (user != null && user.getState() != UserInfo.STATE_NORMAL) {

         out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));

         return;

      }



      if (auctionId == null || auctionId <= 0) {

         out.print(JsonUtil.loadFalseResult(2, "商品ID不能为空"));

         return;

@@ -74,6 +86,8 @@
      JSONObject data = new JSONObject();

      boolean isNative = false;

      String pid = null;



      boolean specialConvert = false;



      String specialId = null;

      // 查询用户ID是否绑定了会员运营ID

@@ -86,11 +100,18 @@
            TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);

            if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {

               isNative = true;

               specialConvert = true;

            } else

               isNative = false;

         } catch (TaobaoGoodsDownException e) {

            out.print(JsonUtil.loadFalseResult(3, "商品已下架"));

            return;

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e, "获取商品简版详情出错", auctionId + "");

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }



         pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;

@@ -99,16 +120,25 @@
         isNative = true;

      }



      data.put("native", isNative);

      try {

         int pidType = PidUser.TYPE_FANLI_ANDROID;

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

            pidType = PidUser.TYPE_FANLI_IOS;



         TaoBaoLink taoBaoLink = null;

         if (!StringUtil.isNullOrEmpty(specialId)) {

         if (!StringUtil.isNullOrEmpty(specialId) && specialConvert) {

            taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);

         } else {

            taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

            if (!specialConvert && !isNative) {

               if (pidType == PidUser.TYPE_FANLI_ANDROID)

                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                        tbPidService.getAndroidDefault().getPid());

               else

                  taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                        tbPidService.getIOSDefault().getPid());

            } else

               taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

         }



         JSONObject link = new JSONObject();

@@ -133,6 +163,8 @@
            tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);

         }



         data.put("native", isNative);



         if (tbPid != null) {

            String siteId = tbPid.getPid().split("_")[2];

            String adzoneId = tbPid.getPid().split("_")[3];

@@ -145,7 +177,6 @@
            out.print(JsonUtil.loadFalseResult(1, "请求失败"));

         }

      }

      data.put("native", isNative);



   }