冲突

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;



   /**

    * 获取淘宝的分享链接

    * 

@@ -63,6 +69,12 @@
         PrintWriter out) {

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

         out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

         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;

      }



@@ -94,6 +106,12 @@
         } 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;