Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

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

import com.yeshi.fanli.exception.user.TokenRecordException;

import com.yeshi.fanli.log.LogHelper;

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

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

@@ -45,11 +46,13 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

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

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

@@ -62,6 +65,7 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.brand.TaoBaoShopVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.msg.TokenVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -105,6 +109,9 @@


   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

	
   @Resource

   private TokenRecordService tokenRecordService;



   /**

    * 粘贴板信息推荐

@@ -115,18 +122,25 @@
    * @param out

    */

   @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)

   public void getRecommendInfo(AcceptData acceptData, String text, PrintWriter out) {

   public void getRecommendInfo(AcceptData acceptData, String text, Long uid, PrintWriter out) {

      if (StringUtil.isNullOrEmpty(text)) {

         out.print(JsonUtil.loadFalseResult("值为空"));

         return;

      }

      // 去除前后空格

      text = text.trim();



      if (text.length() > 256) {

         out.print(JsonUtil.loadFalseResult("值过长"));

		
      try {

         TokenVO tokenVO = tokenRecordService.discernToken(text, uid);

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

         return;

      } catch (TokenRecordException e) {

         if (e.getCode() == 1001) { // 需要用户登录

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

            return;

         }

      }





      TaoBaoGoodsBrief tb = null;

      String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";

@@ -134,6 +148,10 @@
      Pattern p = Pattern.compile(URL_REGEX);

      Matcher matcher = p.matcher(text);

      if (!matcher.find()) {// 不包含链接

         if (text.length() > 256) {

            out.print(JsonUtil.loadFalseResult("值过长"));

            return;

         }

         String pattern = "^[A-Za-z0-9-]+$";

         if (Pattern.matches(pattern, text.replace(" ", ""))) {//删除空格

            out.println(JsonUtil.loadFalseResult("不支持推荐"));

@@ -217,6 +235,33 @@
         return;

      }





      JSONObject data = new JSONObject();

		
      if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

         if (tb != null) {

            TaoBaoGoodsBrief goodsBrief = null;

            try {

               goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }

            if (goodsBrief == null) {

               out.println(JsonUtil.loadFalseResult("暂未找到该商品，请稍后再试！"));

               return;

            }

            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

         data.put("type", 3);

         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

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

         return;

      }

		
      if (tb != null) {

         commonGoods = new CommonGoods();

         commonGoods.setPrice(tb.getZkPrice());

@@ -225,8 +270,7 @@
         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         commonGoods.setPicture(tb.getPictUrl());

      }



      JSONObject data = new JSONObject();

		
      JSONObject taoBaoGoodsJSON = new JSONObject();

      taoBaoGoodsJSON.put("title", commonGoods.getTitle());

      taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");

@@ -246,7 +290,6 @@
      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);



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

   }



@@ -288,6 +331,26 @@
      return false;

   }



	
   /**

    * 口令领取

    * @param acceptData

    * @param kw

    * @param goodsType

    * @param out

    */

   @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)

   public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {

      try {

         String msg = tokenRecordService.receiveToken(token, uid);

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

      } catch (TokenRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }

	
	
	
   /**

    * 搜索候选词

    *