Merge branch 'master' into div

yujian

2019-07-16 b651fb598b4da4ffa734a372e8d1b0b01eeef3fa

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

@@ -28,6 +28,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShop;

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

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

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.log.LogHelper;

@@ -539,7 +540,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -667,7 +668,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -779,7 +780,7 @@
      ShareInfoVO shareInfoVO = new ShareInfoVO();

      shareInfoVO.setUrl(shareUrl);

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShareInfo(shareInfoVO);

      extraVO.setShare(shareInfoVO);



      JSONObject object = new JSONObject();

      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));

@@ -797,5 +798,112 @@
         }

      });

   }

	
	
   /**

    * 商品详情推荐（猜你喜欢  +  推荐）

    * 
    * @param acceptData

    * @param id

    * @param out

    */

   @RequestMapping(value = "getRecommendGoods", method = RequestMethod.POST)

   public void getRecommendGoods(AcceptData acceptData, long id, Integer goodsType, PrintWriter out) {

      if (goodsType == null) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }

		
      // 京东

      if (goodsType == Constant.SOURCE_TYPE_JD) {

         JSONObject data = new JSONObject();

         data.put("listQuality", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));

         data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));

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

         return;

      }

		
      // 拼多多

      if (goodsType == Constant.SOURCE_TYPE_PDD) {

         JSONObject data = new JSONObject();

         data.put("listQuality", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));

         data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));

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

         return;

      }



		
      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);

      // 初始化

      if (goodsList == null) {

         goodsList = new ArrayList<TaoBaoGoodsBrief>();

      }





      List<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>();

      TaoKeAppInfo app = new TaoKeAppInfo();

      app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);

      app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

      app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);

      app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);



      List<Long> ids = new ArrayList<>();

      for (TaoBaoGoodsBrief goods : goodsList)

         ids.add(goods.getAuctionId());



      try {

         goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

      } catch (TaoKeApiException e1) {

         e1.printStackTrace();

      } catch (TaobaoGoodsDownException e1) {

         e1.printStackTrace();

      }



      if (goodsList != null && goodsList.size() > 0) {

			
         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

			
         goodsList.parallelStream().forEach(goods -> {

            if (goods != null) {

               // 获取详情

               TaoBaoGoodsBrief taoBaoGoodsBrief = null;

               try {

                  taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());

               } catch (Exception e) {

                  e.printStackTrace();

               }



               if (taoBaoGoodsBrief == null) {

                  TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                  goods.setCouponInfo(newGoods.getCouponInfo());

                  goods.setCouponLink(newGoods.getCouponLink());

                  goods.setTkRate(newGoods.getTkRate());

                  taoBaoGoodsBrief = goods;

               }



               if (taoBaoGoodsBrief != null) {

                  listExtra.add(GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate));

               }

            }

         });

      }

		
		
      List<GoodsDetailVO> listQuality = new ArrayList<GoodsDetailVO>();

      // 取偶数个数据

      if (listExtra.size() % 2 != 0) {

         listExtra.remove(listExtra.size() - 1);

      }



      if (listQuality.size() % 2 != 0) {

         listQuality.remove(listQuality.size() - 1);

      }



      JSONObject data = new JSONObject();

      data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));

      data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));

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

   }





}