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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -10,12 +10,14 @@
import java.util.regex.Pattern;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.google.gson.Gson;

@@ -40,6 +42,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

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

@@ -53,6 +56,7 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.VersionUtil;

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

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

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

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

@@ -109,9 +113,15 @@


   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

	


   @Resource

   private TokenRecordService tokenRecordService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   /**

    * 粘贴板信息推荐

@@ -129,7 +139,7 @@
      }

      // 去除前后空格

      text = text.trim();

		


      try {

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

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

@@ -140,7 +150,6 @@
            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\\&%_\\./-~-]*)?";

@@ -153,7 +162,7 @@
            return;

         }

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

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

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

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

            return;

         }

@@ -181,7 +190,14 @@


      CommonGoods commonGoods = null;

      text = matcher.group();

      if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 聚划算



      if (text.startsWith("https://a.m.taobao.com/i"))// 淘宝账号未登录状态

      {

         text = text.substring("https://a.m.taobao.com/i".length(), text.indexOf(".htm"));

         if (NumberUtil.isNumeric(text)) {

            tb = TaoBaoUtil.isAlimama(text);

         }

      } else if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 聚划算

         int index = text.indexOf("item_id");

         if (index < 0) {

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

@@ -235,10 +251,9 @@
         return;

      }





      JSONObject data = new JSONObject();

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



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

         if (tb != null) {

            TaoBaoGoodsBrief goodsBrief = null;

            try {

@@ -257,11 +272,12 @@
         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)));

         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());

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

         commonGoods.setPicture(tb.getPictUrl());

      }

		


      JSONObject taoBaoGoodsJSON = new JSONObject();

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

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

@@ -331,8 +347,8 @@
      return false;

   }



	
   /**

    * 口令领取

    * 

    * @param acceptData

    * @param kw

@@ -342,15 +358,13 @@
   @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)

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

      try {

         tokenRecordService.receiveToken(token, uid);

         out.print(JsonUtil.loadTrueResult("领取成功"));

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

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

      } catch (TokenRecordException e) {

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

      }

   }

	
	
	


   /**

    * 搜索候选词

    * 

@@ -403,7 +417,8 @@
    */

   @RequestMapping(value = "searchGoods")

   public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,

         Integer order, PrintWriter out) {

         Integer order, Long uid, HttpSession session, PrintWriter out) {



      if (goodsType == null || goodsType < 1 || goodsType > 3) {

         out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数"));

         return;

@@ -420,6 +435,24 @@
      }

      final String searchkey = key.trim();



      if (uid != null) {

         if (page == 1) {

            integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());

         } else if (page > 1) {

            Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());

            if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览

               integralGetCacheManager.clearSearchTime(acceptData.getDevice());

               ThreadUtil.run(new Runnable() {

                  @Override

                  public void run() {

                     // 增加金币

                     integralGetService.addSearchResultScan(uid, key);

                  }

               });

            }

         }

      }



      executor.execute(new Runnable() {

         @Override

         public void run() {