Merge remote-tracking branch 'origin/master'

admin

2019-02-25 21a5d62894e6cca7d536ffcc1d63898ffaf16185

 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;

@@ -23,6 +24,7 @@
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 +51,9 @@
   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Resource

   private UserInfoService userInfoService;



   /**

    * 获取淘宝的分享链接

    * 

@@ -66,6 +71,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;