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;

@@ -27,29 +29,36 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

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

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

   private TaskExecutor executor;



   @Resource

   private TokenRecordService tokenRecordService;



   @Resource

   private IntegralGetService integralGetService;



   @Resource

   private IntegralGetCacheManager integralGetCacheManager;



   /**

    * 粘贴板信息推荐

    * 

@@ -113,17 +132,23 @@
    * @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();

      // 去除前后空格

      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;

@@ -132,8 +157,12 @@
      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)) {

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

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

            return;

         }

@@ -159,8 +188,16 @@
         return;

      }



      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("暂未找到该商品，请稍后再试！"));

@@ -191,30 +228,84 @@
         }

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

            if (!StringUtil.isNullOrEmpty(jdId)) {

               JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

               if (goods != null)

                  commonGoods = CommonGoodsFactory.create(goods);

            } else {

               String pddId = PinDuoDuoUtil.getPDDGoodsId(text);

               if (!StringUtil.isNullOrEmpty(pddId)) {

                  PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));

                  if (goods != null)

                     commonGoods = CommonGoodsFactory.create(goods);

               }

            }

         }

      }



      if (tb == null) {

      if (tb == null && commonGoods == null) {

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

         return;

      }



      JSONObject data = new JSONObject();

      JSONObject taoBaoGoodsJSON = new JSONObject();

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

      taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());

      taoBaoGoodsJSON.put("id", tb.getAuctionId());

      taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);

      taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());

      data.put("goods", taoBaoGoodsJSON);

      if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {

         if (tb.getImgList() == null)

            tb.setImgList(new ArrayList<>());

         tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));



      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;

      }

      data.put("imgs", tb.getImgList());



      if (tb != null) {

         commonGoods = new CommonGoods();

         commonGoods.setPrice(tb.getZkPrice());

         commonGoods.setTitle(tb.getTitle());

         commonGoods.setGoodsId(tb.getAuctionId());

         commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         commonGoods.setPicture(tb.getPictUrl());

      }



      JSONObject taoBaoGoodsJSON = new JSONObject();

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

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

      taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());

      taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());

      if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {

         taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {

         taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));

      } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {

         taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());

      }

      data.put("goods", taoBaoGoodsJSON);

      List<String> picList = new ArrayList<>();

      picList.add(commonGoods.getPicture());

      data.put("imgs", picList);

      JSONObject root = new JSONObject();

      root.put("type", 1);

      root.put("data", data);



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

   }



@@ -254,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()));

      }

   }



   /**

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

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