订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

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

@@ -13,7 +13,6 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;



@@ -26,6 +25,7 @@
import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;

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

import com.yeshi.fanli.dto.suning.SuningGoodsInfo;

import com.yeshi.fanli.dto.suning.SuningGoodsInfoRecommend;

import com.yeshi.fanli.dto.taobao.DaTaoKeFilterResult;

import com.yeshi.fanli.dto.vip.VIPConvertResultDTO;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

@@ -33,6 +33,10 @@
import com.yeshi.fanli.entity.bus.user.ShamUser;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.dynamic.CommentInfo;

import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;

import com.yeshi.fanli.entity.dynamic.ImgInfo;

import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;

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

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

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

@@ -654,6 +658,12 @@
         couponInfoList.add(goodsDetail.getCouponInfo());

         goodsDetail.setCouponInfoList(couponInfoList);

      }

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

         getCloudInfo(acceptData, goodsDetail, extraVO);  // 云发单文案信息

      }

		
      JSONObject object = new JSONObject();

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

      object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));

@@ -871,6 +881,10 @@
      ShareVO shareInfoVO = new ShareVO();

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);

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

         getCloudInfo(acceptData, goodsDetail, extraVO);  // 云发单文案信息

      }



      JSONObject object = new JSONObject();

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

@@ -1056,6 +1070,10 @@
         extraVO.setCouponJumpLink(convertUrl.getUrl());

         extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

      }

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

         getCloudInfo(acceptData, goodsDetail, extraVO); // 云发单文案信息

      }



      JSONObject object = new JSONObject();

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

@@ -1191,6 +1209,9 @@
      ShareVO shareInfoVO = new ShareVO();

      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);

		
      // 云发单文案信息

      getCloudInfo(acceptData, goodsDetail, extraVO); 


      JSONObject object = new JSONObject();

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

@@ -1323,6 +1344,9 @@
      shareInfoVO.setHelpLink(helpLink);

      extraVO.setShare(shareInfoVO);



      // 云发单文案信息

      getCloudInfo(acceptData, goodsDetail, extraVO); 
				
      JSONObject object = new JSONObject();

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

      object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));

@@ -1345,6 +1369,49 @@
         }

      });

   }

	
   /**

    *    // 云发单文案信息

    * @param goodsDetail

    */

   private void getCloudInfo(AcceptData acceptData, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {

      // 云发单是否开启

      String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),

            Integer.parseInt(acceptData.getVersion()));

      if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {

         extraVO.setCloudOpen(true);

      }

		
		
      if (!goodsDetail.isHasCoupon()) {

         return;

      }

		
      GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsDetail.getGoodsId() +"", goodsDetail.getGoodsType());

      if (evaluate != null) {

         String cloudText = null;

         List<CommentInfo> comments = evaluate.getComments();

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

            cloudText = comments.get(0).getContent();

         }

			
         String cloudPic = null;

         List<ImgInfo> imgList = evaluate.getImgList();

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

            for (ImgInfo imgInfo: imgList) {

               ImgEnum type = imgInfo.getType();

               if (type == ImgEnum.goods) {

                  cloudPic = imgInfo.getUrl();

               }

            }

         }

			
         if (!StringUtil.isNullOrEmpty(cloudText) && !StringUtil.isNullOrEmpty(cloudPic)) {

            extraVO.setCloudPic(cloudPic);

            extraVO.setCloudText(cloudText);

         }

      }

   }



   /**

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

@@ -1360,7 +1427,6 @@
      }



      try {



         // 京东

         if (goodsType == Constant.SOURCE_TYPE_JD) {

            JSONObject data = new JSONObject();

@@ -1433,11 +1499,50 @@
            return;

         }



         if (goodsType == Constant.SOURCE_TYPE_SUNING) {

            // 猜你喜欢



         // 唯品会

         if (goodsType == Constant.SOURCE_TYPE_VIP) {

            JSONObject data = new JSONObject();

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

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

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

            return;

         }

			
         // 苏宁

         if (goodsType == Constant.SOURCE_TYPE_SUNING) {

            List<SuningGoodsInfo> resultList = null;

            String[] ids = SuningUtil.getGoodsIdDetail(id);

            List<SuningGoodsInfoRecommend> list = SuningApiUtil.getRecommendGoods(ids[1], ids[0]);

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

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

               for (SuningGoodsInfoRecommend goodsInfo:  list) {

                   if (goodsInfo != null) {

                      listId.add(goodsInfo.getCommodityCode() + "-" + goodsInfo.getSupplierCode());

                   }

               }

               resultList = SuningApiUtil.getGoodsDetailList(listId);

            }

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

            if (resultList != null) {

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

                  ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                        acceptData.getVersion());



                  for (SuningGoodsInfo goods : resultList) {

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

                     listDetailVO.add(goodsDetailVO);

                  }

               }

            }

				
            JSONObject data = new JSONObject();

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

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

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

            return;

         }

			
         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(Long.parseLong(id), 10);

         // 初始化

         if (goodsList == null) {

@@ -1445,50 +1550,12 @@
         }



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

         } catch (TaobaoGoodsDownException e1) {

         }



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



            ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);



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

                  }

               }

            });

         }

         ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);

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

            if (goods != null) {				
               listExtra.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

            }

         });



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

         // 取偶数个数据