订单补偿 + 奖励券使用倒计时

yujian

2019-10-21 d085ca89e39b4cda025a9a53d3797fbe8b242ae7

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

@@ -182,6 +182,8 @@
         if (analysisTaoToken(acceptData, text, out)) {

            return;

         }

         if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text)))

            return;



         JSONObject root = new JSONObject();

         root.put("type", 2);

@@ -238,24 +240,29 @@
         return;

      } else {

         tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);

			


         if (tb == null) {

            String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);

            if (!StringUtil.isNullOrEmpty(goodsId)) {

               tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);

               if (tb != null) 
               if (tb != null)

                  type = 4;

            }

         }

			
			


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

                  // 高级接口 -- 信息更完整

                  JDGoods jdGoods = JDApiUtil.queryGoodsDetail(Long.parseLong(jdId));

                  if (jdGoods != null) {

                     commonGoods = CommonGoodsFactory.create(jdGoods);

                  } else {

                     commonGoods = CommonGoodsFactory.create(goods);

                  }

               } else {

                  type = 4;

                  goods = JDUtil.getSimpleGoodsInfo(jdId);

@@ -274,7 +281,7 @@
                  } else {

                     type = 4;

                     goods = PinDuoDuoUtil.getPDDGoodsInfo(pddId);

                     if(goods != null) {

                     if (goods != null) {

                        commonGoods = new CommonGoods();

                        commonGoods.setTitle(goods.getGoodsName());

                        commonGoods.setPicture(goods.getGoodsThumbnailUrl());

@@ -284,42 +291,42 @@
            }

         }

      }

		


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

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

         return;

      }

		


      if (type == 4) {

         if (!VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {

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

            return;

         } 
			
         }



         JSONObject data = new JSONObject();

         if (tb != null) {

            commonGoods = new CommonGoods();

            commonGoods.setTitle(tb.getTitle());

            commonGoods.setPicture(tb.getPictUrl());

         }

			
         if (StringUtil.isNullOrEmpty(commonGoods.getTitle()) || StringUtil.isNullOrEmpty(commonGoods.getPicture())) {



         if (StringUtil.isNullOrEmpty(commonGoods.getTitle())

               || StringUtil.isNullOrEmpty(commonGoods.getPicture())) {

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

            return;

         }

			


         JSONObject goodsJSON = new JSONObject();

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

         goodsJSON.put("pictUrl", commonGoods.getPicture());

			


         data.put("type", type);

         data.put("desc", "该商品无推广信息");

         data.put("goods", goodsJSON);

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

         return;

      } 
		
		
      }



      JSONObject data = new JSONObject();

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

         if (tb != null) {

@@ -335,7 +342,7 @@
            }

            commonGoods = CommonGoodsFactory.create(goodsBrief);

         }

			


         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

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

@@ -377,9 +384,10 @@
      root.put("data", data);

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

   }

	


   /**

    * 解析抖音链接

    * 
    * @param acceptData

    * @param text

    * @param out

@@ -399,7 +407,7 @@
            JSONObject goodsJSON = new JSONObject();

            goodsJSON.put("title", goods.getName());

            goodsJSON.put("pictUrl", goods.getImg());

				


            JSONObject data = new JSONObject();

            data.put("type", 4);

            data.put("desc", "该商品无推广信息");

@@ -412,10 +420,9 @@
      return;

   }



	
	
   /**

    * 解析淘口令

    * 
    * @param acceptData

    * @param text

    * @param out

@@ -441,25 +448,25 @@
                  } catch (TaobaoGoodsDownException e) {

                     e.printStackTrace();

                  }

						


                  if (goodsBrief == null) {

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

                     return false;

                  }

						


                  BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                  BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

					


                  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, null, fanLiRate, shareRate)));

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

                  return true;

               }

					
					


               JSONObject data = new JSONObject();

               JSONObject taoBaoGoodsJSON = new JSONObject();

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

@@ -643,7 +650,8 @@
    * @param endprice

    * @return

    */

   private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchTaoBaoGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {

      SearchFilter sf = new SearchFilter();

      sf.setKey(SearchFilterUtil.filterSearchContent(key));

      sf.setPage(page);

@@ -744,7 +752,8 @@
            String platform = acceptData.getPlatform();

            TaoBaoShopVO taoBaoShop = listShop.get(0);

            if (("ios".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0(platform, acceptData.getVersion()))

               || ("android".equalsIgnoreCase(platform) && VersionUtil.greaterThan_2_0_1(platform, acceptData.getVersion()))) {

                  || ("android".equalsIgnoreCase(platform)

                        && VersionUtil.greaterThan_2_0_1(platform, acceptData.getVersion()))) {

               BrandInfoVO brandInfoVO = new BrandInfoVO();

               brandInfoVO.setId(taoBaoShop.getId());

               brandInfoVO.setName(taoBaoShop.getShopName());

@@ -770,7 +779,8 @@
    * @param endprice

    * @return

    */

   private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchJDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {



      JDSearchResult result = null;

      boolean hasCoupon = false;

@@ -945,7 +955,8 @@
    * @param endprice

    * @return

    */

   private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order, PrintWriter out) {

   private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

         PrintWriter out) {

      PDDSearchFilter pddfilter = new PDDSearchFilter();

      pddfilter.setKw(SearchFilterUtil.filterSearchContent(key));

      pddfilter.setPage(page);