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

@@ -35,22 +36,27 @@
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;

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;

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.IntegralGetCacheManager;

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

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

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

@@ -63,6 +69,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;

@@ -107,6 +114,15 @@
   @Resource(name = "taskExecutor")

   private TaskExecutor executor;



   @Resource

   private TokenRecordService tokenRecordService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   /**

    * 粘贴板信息推荐

    * 

@@ -116,13 +132,24 @@
    * @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();



      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\\&%_\\./-~-]*)?";

@@ -224,6 +251,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());

@@ -233,7 +287,6 @@
         commonGoods.setPicture(tb.getPictUrl());

      }



      JSONObject data = new JSONObject();

      JSONObject taoBaoGoodsJSON = new JSONObject();

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

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

@@ -253,7 +306,6 @@
      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);



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

   }



@@ -293,6 +345,24 @@
         }

      }

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

      }

   }



   /**

@@ -347,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;

@@ -364,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() {