Merge remote-tracking branch 'origin/div' into div

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

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

@@ -23,6 +23,7 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.douyin.DouYinGoods;

import com.yeshi.fanli.dto.jd.JDFilter;

import com.yeshi.fanli.dto.jd.JDSearchFilter;

@@ -146,7 +147,7 @@
      text = text.trim();



      try {

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

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

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

         return;

      } catch (TokenRecordException e) {

@@ -222,7 +223,7 @@
         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            type = 4;

            tb = TaoBaoUtil.getTmallGoodsInfo(id);

            tb = getTaoBaoGoodsBriefFromGoodsId(id);

         }

      } else if (text.contains("http://zmnxbc.com")) { // 手机端天猫APP分享

         tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);

@@ -234,7 +235,7 @@
         tb = TaoBaoUtil.isAlimama(id);

         if (tb == null) {

            type = 4;

            tb = TaoBaoUtil.getTmallGoodsInfo(id);

            tb = getTaoBaoGoodsBriefFromGoodsId(id);

         }

      } else if (text.contains("v.douyin.com")) { // 抖音

         analysisDouYin(acceptData, text, out);

@@ -245,7 +246,7 @@
         if (tb == null) {

            String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);

            if (!StringUtil.isNullOrEmpty(goodsId)) {

               tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);

               tb = getTaoBaoGoodsBriefFromGoodsId(goodsId);

               if (tb != null)

                  type = 4;

            }

@@ -254,6 +255,10 @@
         if (tb == null)// 淘宝是空值

         {

            String jdId = JDUtil.getJDGoodsId(text);

            if (StringUtil.isNullOrEmpty(jdId)) {

               jdId = JDUtil.getJDGoodsIdByWeiXin(text);

            }

				
            if (!StringUtil.isNullOrEmpty(jdId)) {

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

               if (goods != null) {

@@ -349,8 +354,8 @@
         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

         data.put("type", type);

         data.put("goods",

               gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

         data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

               new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

         return;

      }

@@ -384,6 +389,17 @@
      root.put("type", 1);

      root.put("data", data);

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

   }



   private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId) {

      TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);

      if (tb == null && NumberUtil.isNumeric(goodsId)) {// 是数字

         tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));

         if (tb != null) {

            tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));

         }

      }

      return tb;

   }



   /**

@@ -462,8 +478,8 @@


                  JSONObject data = new JSONObject();

                  data.put("type", 3);

                  data.put("goods", gson

                        .toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, null, fanLiRate, shareRate)));

                  data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

                  return true;

               }

@@ -505,7 +521,7 @@
   @RequestMapping(value = "tokenReceive", method = RequestMethod.POST)

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

      try {

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

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

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

      } catch (TokenRecordException e) {

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

@@ -735,8 +751,10 @@
      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



      for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate));

         list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

      }



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

@@ -927,8 +945,10 @@
            BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

               if (hasCoupon) {

                  if (goodsDetailVO.isHasCoupon()) {

                     array.add(gson.toJson(goodsDetailVO));

@@ -1009,9 +1029,10 @@
         if (goodsList != null && goodsList.size() > 0) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (PDDGoodsDetail goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

               array.add(gson.toJson(goodsDetailVO));

            }

         }