From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 1716 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 1,400 insertions(+), 316 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index db168956..bf824c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -3,27 +3,50 @@
 import java.io.PrintWriter;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.json.simple.JSONArray;
 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;
 
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.jd.JDCategoryInfo;
+import com.yeshi.fanli.dto.jd.JDCouponInfo;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
+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;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.ShamUser;
-import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
+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;
+import com.yeshi.fanli.entity.jd.JDGoodsClass;
 import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 import com.yeshi.fanli.entity.taobao.ClientTBPid;
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
+import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
@@ -32,48 +55,71 @@
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
+import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
 import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
 import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 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.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
-import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
 import com.yeshi.fanli.service.inter.user.ShamUserService;
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
+import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
 import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
 import com.yeshi.fanli.util.factory.goods.ShopInfoVOFactory;
 import com.yeshi.fanli.util.jd.JDApiUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
+import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
+import com.yeshi.fanli.util.suning.SuningApiUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
+import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
+import com.yeshi.fanli.util.vipshop.VipShopUtil;
+import com.yeshi.fanli.vo.goods.CouponInfoVO;
 import com.yeshi.fanli.vo.goods.GoodsDetailExtraVO;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.goods.MoneyInfoVO;
 import com.yeshi.fanli.vo.goods.OtherInfo;
+import com.yeshi.fanli.vo.goods.RewardCouponVO;
 import com.yeshi.fanli.vo.goods.ShareVO;
+import com.yeshi.fanli.vo.goods.ShopInfoVO;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.tlj.NewUserHongBao;
 import com.yeshi.fanli.vo.tlj.ReduceHongBao;
-import com.yeshi.fanli.vo.tlj.SpreadHongBao;
 
 import net.sf.json.JSONObject;
 
@@ -115,10 +161,10 @@
 	private TaoBaoUnionConfigService taoBaoUnionConfigService;
 
 	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
 	@Resource
-	private HongBaoManageService hongBaoManageService;
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource
 	private SystemClientParamsService systemClientParamsService;
@@ -127,13 +173,7 @@
 	private UserGoodsStorageService userGoodsStorageService;
 
 	@Resource
-	private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
-	@Resource
 	private ConfigTaoLiJinService configTaoLiJinService;
-
-	@Resource
-	private UserTaoLiJinRecordService userTaoLiJinRecordService;
 
 	@Resource
 	private UserInfoExtraService userInfoExtraService;
@@ -146,56 +186,105 @@
 
 	@Resource
 	private TLJBuyGoodsService tljBuyGoodsService;
-	
-	
+
+	@Resource
+	private UserInfoService userInfoService;
+
+	@Resource
+	private JDGoodsCacheUtil jdGoodsCacheUtil;
+
+	@Resource
+	private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
+
+	@Resource
+	private IntegralGetService integralGetService;
+
+	@Resource
+	private JumpDetailV2Service jumpDetailV2Service;
+
+	@Resource
+	private JDGoodsClassService jdGoodsClassService;
+
+	@Resource
+	private TLJFreeBuyGoodsService tljFreeBuyGoodsService;
+
+	@Resource
+	private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;
+
+	@Resource
+	private UserVIPInfoService userVIPInfoService;
+
+	@Resource
+	private UserVipConfigService userVipConfigService;
+
+	@Resource
+	private GoodsEvaluateService goodsEvaluateService;
+
+	@Resource
+	private UserLevelManager userLevelManager;
+
+	@Resource
+	private HongBaoManageService hongBaoManageService;
+
+	private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid) {
+		UserLevelEnum level = UserLevelEnum.daRen;
+		if (uid != null && uid > 0) {
+			level = userLevelManager.getUserLevel(uid);
+			if (level != null) {
+				if (System.currentTimeMillis() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+					level = UserLevelUtil.getOldLevel(level);
+			}
+		}
+		if (level == null)
+			level = UserLevelEnum.daRen;
+		return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level);
+	}
+
+	private TaoBaoGoodsBrief filterDaTaoKeGoodsInfo(TaoBaoGoodsBrief goods) {
+		try {
+			DaTaoKeFilterResult result = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
+			if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON
+					|| result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON) {
+				// 缂撳瓨鍩虹閾炬帴
+				String dpid = null;
+				if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
+					dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+				} else {
+					dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
+				}
+				String link = taoBaoGoodsCacheUtil.getBaseConvertLink(goods.getAuctionId(), dpid);
+				if (!StringUtil.isNullOrEmpty(link)) {
+					// result.getGoods().setCouponLink(link);
+					return result.getGoods();
+				} else {
+					link = DaTaoKeApiUtil.convertLink(goods.getAuctionId(), dpid);
+					if (!StringUtil.isNullOrEmpty(link)) {
+						// result.getGoods().setCouponLink(link);
+						taoBaoGoodsCacheUtil.cacheBaseConvertLink(goods.getAuctionId(), dpid, link);
+					}
+					return result.getGoods();
+				}
+			}
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+		}
+
+		return goods;
+	}
+
 	/**
-	 * 鑾峰彇鍟嗗搧璇︽儏
+	 * 娣樺疂鍟嗗搧璇︽儏
 	 * 
 	 * @param acceptData
 	 * @param id
-	 * @param source
 	 * @param uid
 	 * @param from
 	 * @param out
 	 */
-	@RequestMapping(value = "getDetail", method = RequestMethod.POST)
-	public void getDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, PrintWriter out) {
+	@RequestMapping(value = "getDetailTB", method = RequestMethod.POST)
+	public void getDetialTB(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
 		if (id == null) {
 			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id涓嶈兘涓虹┖"));
-			return;
-		}
-		
-		// 娣樺疂鍟嗗搧
-		if (goodsType == null || Constant.SOURCE_TYPE_TAOBAO == goodsType) {
-			getTaoBaoGoodsDetial(acceptData, id, uid, from, out);
-			return;
-		}
-
-		// 浜笢鍟嗗搧
-		if (Constant.SOURCE_TYPE_JD == goodsType) {
-			getJDGoodsDetial(acceptData, id, uid, from, out);
-			return;
-		}
-
-		// 鎷煎澶氬晢鍝�
-		if (Constant.SOURCE_TYPE_PDD == goodsType) {
-			getPDDGoodsDetial(acceptData, id, uid, from, out);
-			return;
-		}
-	}
-	
-	
-	/**
-	 * 娣樺疂鍟嗗搧璇︽儏
-	 * @param acceptData
-	 * @param id
-	 * @param uid
-	 * @param from
-	 * @param out
-	 */
-	public void getTaoBaoGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
-		if (id == null) {
-			out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
 			return;
 		}
 
@@ -229,7 +318,7 @@
 
 		LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
 
-		final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+		// final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		// 鏄惁鍦ㄦ湇鍔$杩涜杞摼
 		boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
 
@@ -245,6 +334,7 @@
 					app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
 					app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);
 					goods = TaoKeApiUtil.searchGoodsDetail(id, app);
+
 					final TaoBaoGoodsBrief finalGoods = goods;
 					if (goods != null) {
 						ThreadUtil.run(new Runnable() {
@@ -258,11 +348,11 @@
 			} catch (TaobaoGoodsDownException e) {
 				// 鍟嗗搧涓嬫灦
 				ThreadUtil.run(new Runnable() {
+
 					public void run() {
 						taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
 					}
 				});
-
 			}
 
 		} else {
@@ -299,7 +389,6 @@
 		}
 
 		if (goods != null) {
-			goodsList.add(goods);
 			final TaoBaoGoodsBrief newGoods = goods;
 			ThreadUtil.run(new Runnable() {
 				public void run() {
@@ -314,10 +403,7 @@
 			});
 		}
 
-		TaoBaoGoodsBrief tb = null;
-		if (goodsList.size() > 0) {
-			tb = goodsList.get(0);
-		}
+		TaoBaoGoodsBrief tb = goods;
 
 		if (tb == null) {
 			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
@@ -328,27 +414,62 @@
 			tb.setImgList(new ArrayList<>());
 		}
 
-		tb.getImgList().add(0, tb.getPictUrl());
+		// tb.getImgList().add(0, tb.getPictUrl());
 
 		List<String> finalImgList = new ArrayList<>();
 		for (String img : tb.getImgList()) {
 			finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
 		}
+
+		if (finalImgList.size() == 0) {
+			finalImgList.add(tb.getPictUrl());
+		}
+
 		if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
 			finalImgList.add(0, tb.getPictUrlWhite());
 
+		// 绉婚櫎鐩稿悓鍥剧墖
+		if (finalImgList.size() > 0)
+			for (int i = 0; i < finalImgList.size(); i++) {
+				if (i < finalImgList.size() - 1)
+					if (TbImgUtil.getTBSizeImg(finalImgList.get(i), 600)
+							.equalsIgnoreCase(TbImgUtil.getTBSizeImg(finalImgList.get(i + 1), 600))) {
+						finalImgList.remove(i--);
+					}
+			}
+
+		tb.setImgList(finalImgList);
+
 		// 澶ф窐瀹㈠晢鍝佽繃婊�
 		try {
-			goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+			goods = filterDaTaoKeGoodsInfo(goods);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
-		
-		
-		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-		BigDecimal shareRate = hongBaoManageService.getShareRate();
-		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
-		
+
+		ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
+		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
+		if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+			goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			goodsDetail.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getGoodsHongBaoMoney(goods,
+					hongBaoManageService.getShareRate(UserLevelEnum.superVIP), true));
+			goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+			goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+		}
+		goodsDetail.getMoneyInfo()
+				.setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+		if (TaoBaoUtil.isYUShou(goods)) {
+			if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {
+				if (goodsDetail.getLabels() == null)
+					goodsDetail.setLabels(new ArrayList<>());
+				goodsDetail.getLabels().add(new ClientTextStyleVO(goods.getPresaleDiscountFeeText(), "#FF2B4E"));
+			}
+		}
+		// 鍦ㄦ爣棰樻坊鍔犱紭鎯犱俊鎭�
+
 		// 搴楅摵淇℃伅
 		TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId());
 		if (shop != null) {
@@ -358,7 +479,7 @@
 			}
 			goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop));
 		}
-		
+
 		// 鏈夊埜澶勭悊
 		if (goodsDetail.isHasCoupon()) {
 			if (!StringUtil.isNullOrEmpty(from)) {
@@ -369,22 +490,22 @@
 				}
 			}
 		}
-		
+
 		extraVO.setTbPidInfo(clientTBPid);
-		extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
-		
+		extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img.html?id=" + id);
+
 		// 鍒嗕韩璧氫汉鎻愮ず
 		MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
 		List<ShamUser> listShareUser = new ArrayList<ShamUser>();
 		if (moneyInfo != null) {
 			String shareMoney = moneyInfo.getShareMoney();
 			if (goods.getBiz30day() >= 1000) {
-				listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney.replaceAll("楼", "")), 1, 5);
+				listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney.replaceAll("楼", "")), 1,
+						5);
 			}
 		}
 		extraVO.setListShareUser(listShareUser);
-		
-		
+
 		// 棰嗗埜浜哄垪琛�
 		List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
 		if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
@@ -394,8 +515,7 @@
 			}
 		}
 		extraVO.setListCouponUser(listCouponUser);
-		
-		
+
 		if (uid != null) {
 			// 鏄惁鍔犲叆鏀惰棌
 			CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
@@ -405,95 +525,24 @@
 			extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_TAOBAO));
 		}
 
-
 		// 娴嬭瘯
 		SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
 				"goods_detail_jump_taobao");
 		if ("1".equalsIgnoreCase((params.getValue() + "").trim())) {
 			extraVO.setIsNative(true);
-		} 
-
-		// 鍟嗗搧閾炬帴
-		String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), id + "");
-		try {
-			extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
-		} catch (Exception e) {
-			extraVO.setH5Url(h5Url);
 		}
+
+		String h5Url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePath(), "", id + "");
+
+		extraVO.setH5Url(h5Url);
 
 		String helpLink = null;
 		boolean fanliValid = true;
 		boolean shareValid = true;
 		int moneyType = 1;
-		
-		// 鎺ㄥ箍绾㈠寘
-		if (from != null && from.equals("taolijin")) {
-			// 璁$畻鎺ㄥ箍绾㈠寘
-			String warningRate = configTaoLiJinService.getValueByKey("warning_value");
-			BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
 
-			// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
-			if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
-				out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
-				return;
-			}
-
-			// 鏄惁涓烘柊鐢ㄦ埛
-			boolean isNewUser = userInfoExtraService.isNewUser(uid);
-			if (isNewUser) {
-				// 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
-				long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
-				if (countRecord > 0) {
-					isNewUser = false;
-				}
-			}
-
-			SpreadHongBao spreadHongBao = new SpreadHongBao();
-			if (isNewUser) {
-				spreadHongBao.setMoney("楼1");
-			} else {
-				moneyType = 2;
-				fanliValid = false;
-				spreadHongBao.setMoney("楼" + spreadMoney.toString());
-				
-				ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
-				textStyleVO1.setContent("鍒嗕韩");
-				textStyleVO1.setColor("#666666");
-				ClientTextStyleVO textStyleVO2 = new ClientTextStyleVO();
-				textStyleVO2.setContent("璧氬閲�");
-				textStyleVO2.setColor("#F14242");
-				ClientTextStyleVO textStyleVO3 = new ClientTextStyleVO();
-				textStyleVO3.setContent("锛屽ソ鍙�");
-				textStyleVO3.setColor("#666666");
-				ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();
-				textStyleVO4.setContent("棰嗙孩鍖咃紒");
-				textStyleVO4.setColor("#F14242");
-
-				List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();
-				listText.add(textStyleVO1);
-				listText.add(textStyleVO2);
-				listText.add(textStyleVO3);
-				listText.add(textStyleVO4);
-				extraVO.setTip(listText);
-			}
-			
-			spreadHongBao.setName("鎺ㄥ箍绾㈠寘 ");
-			spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
-			OtherInfo otherInfo = new OtherInfo();
-			otherInfo.setSpreadHongBao(spreadHongBao);
-			goodsDetail.setOtherInfo(otherInfo);
-
-			// 鐢ㄦ埛娣樼ぜ閲�
-			UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
-			if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
-				extraVO.setUserTLJ(new BigDecimal(0).setScale(2).toString());
-			} else {
-				extraVO.setUserTLJ(userMoneyExtra.getTlj().setScale(2).toString());
-			}
-			helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
-
-		} else if (from != null && from.equals("taolijin_buy")) {
+		if (from != null && from.equals("taolijin_buy")) {
 			// 鏌ヨ鍒嗕韩搴�
 			TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(id,
 					TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
@@ -505,43 +554,116 @@
 			moneyType = 2;
 			fanliValid = true;
 			shareValid = false;
-			helpLink = configService.get("zigoulijian_nofanli_help");
-			
-			String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
-			
+			helpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());
+
+			BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,
+					false);
+
 			ReduceHongBao reduceHongBao = new ReduceHongBao();
 			reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());
-			reduceHongBao.setMoney(tljHongBao);
-			reduceHongBao.setName("浠樻绔嬪噺 楼" + tljHongBao);
+			reduceHongBao.setMoney(tljHongBao.toString());
+			reduceHongBao.setName("浠樻绔嬪噺 ");
 			reduceHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
 			reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());
-			
-			
+
 			OtherInfo otherInfo = new OtherInfo();
 			otherInfo.setReduceHongBao(reduceHongBao);
+			goodsDetail.setOtherInfo(otherInfo);
+
+			// 1.6.5鍚庢敼涓虹鍒╀环
+			if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+				if (goodsDetail.getCouponPrice() != null
+						&& goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+					goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));
+				else
+					goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));
+			}
+		} else if (from != null && from.equals("taolijin_free_buy")) {
+			TLJFreeBuyGoods freeGoods = tljFreeBuyGoodsService.selectByAuctionIdAndDay(id,
+					TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+			if (freeGoods == null) {
+				out.print(JsonUtil.loadFalseResult(2, "鍏嶅崟鍟嗗搧宸蹭笅鏋�"));
+				return;
+			}
+
+			fanliValid = true;
+			shareValid = false;
+			BigDecimal couponPrice = goodsDetail.getCouponPrice();
+			if (couponPrice == null)
+				couponPrice = goodsDetail.getZkPrice();
+
+			NewUserHongBao newUserHongBao = new NewUserHongBao();
+			newUserHongBao.setMoney(couponPrice.setScale(2).toString());
+			newUserHongBao.setName("鏂颁汉绾㈠寘 ");
+			newUserHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
+			newUserHongBao.setLeft(1);
+			newUserHongBao.setTotal(1);
+
+			OtherInfo otherInfo = new OtherInfo();
+			otherInfo.setReduceHongBao(newUserHongBao);
+			goodsDetail.setOtherInfo(otherInfo);
+
+			// 涓撳睘鏍囩
+			List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
+			labels.add(new ClientTextStyleVO("鏂颁汉涓撳睘", "#FE0014"));
+			labels.add(new ClientTextStyleVO("瀹炰粯0鍏�", "#FF9600"));
+			goodsDetail.setLabels(labels);
+
+		} else {// 鏅�氳喘涔�
+			OtherInfo otherInfo = new OtherInfo();
+			RewardCouponVO rewardCoupon = new RewardCouponVO();
+			rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+			JSONObject params1 = new JSONObject();
+			if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+				params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+			else
+				params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+			rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+				rewardCoupon.setDesc("杩�");
+				params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+				rewardCoupon.getJumpDetail().setNeedLogin(true);
+			} else
+				rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+			rewardCoupon.setParams(params1.toString());
+
+			otherInfo.setRewardCoupon(rewardCoupon);
+			if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+					&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+				otherInfo.setRewardCoupon(null);
+
 			goodsDetail.setOtherInfo(otherInfo);
 		}
 		extraVO.setFanliValid(fanliValid);
 		extraVO.setShareValid(shareValid);
-		
+
 		MoneyInfoVO goodsMoney = goodsDetail.getMoneyInfo();
 		if (goodsMoney != null) {
 			goodsMoney.setMoneyType(moneyType);
 		}
-		
-		
+
 		// 鍒嗕韩璺緞
 		if (StringUtil.isNullOrEmpty(helpLink)) {
-			helpLink = configService.get("no_rebate_help_link");
+			helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
 		}
-		
+
 		// 鍒嗕韩璺緞
-		String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());
 		ShareVO shareInfoVO = new ShareVO();
-		shareInfoVO.setUrl(shareUrl);
 		shareInfoVO.setHelpLink(helpLink);
 		extraVO.setShare(shareInfoVO);
 
+		if (goodsDetail.isHasCoupon()) {
+			// 璁剧疆couponList
+			List<CouponInfoVO> couponInfoList = new ArrayList<>();
+			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));
@@ -560,7 +682,6 @@
 		});
 	}
 
-
 	/**
 	 * 浜笢鍟嗗搧璇︽儏
 	 * 
@@ -570,7 +691,9 @@
 	 * @param from
 	 * @param out
 	 */
-	public void getJDGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+	@RequestMapping(value = "getDetailJD")
+	public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+		// uid=2255993L;
 		// 绯荤粺楠岃瘉
 		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
 				acceptData.getPackages());
@@ -579,21 +702,114 @@
 			return;
 		}
 
-		JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id);
+		JDGoods jdGoods = JDApiUtil.queryGoodsDetail(id); // 楂樼骇鎺ュ彛
 		if (jdGoods == null) {
-			jdGoods = JDApiUtil.getGoodsDetail(id);
+			jdGoods = JDUtil.getGoodsDetail(id); // 鐖彇缃戦〉
+			// jdGoods = JDApiUtil.getGoodsDetail(id); // 鏅�氭帴鍙�
 		}
-		
+
 		if (jdGoods == null) {
 			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
 			return;
 		}
 
-		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-		BigDecimal shareRate = hongBaoManageService.getShareRate();
-		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, null, fanLiRate, shareRate);
+		List<String> imageList = jdGoods.getImageList();
+		if (imageList == null) {
+			imageList = new ArrayList<String>();
+			imageList.add(jdGoods.getPicUrl());
+		}
 
-		
+		// 淇濆瓨缂撳瓨
+		jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
+
+		ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
+		if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+			goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			goodsDetail.getMoneyInfo().setShareMoney("楼"
+					+ JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+			goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+			goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+		}
+		goodsDetail.getMoneyInfo()
+				.setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+		// 闄勫姞淇℃伅
+		OtherInfo otherInfo = new OtherInfo();
+
+		// 浜笢plus杩斿埄
+		String maxMoneyPlus = null;
+		JDCategoryInfo categoryInfo = jdGoods.getCategoryInfo();
+		if (categoryInfo != null && categoryInfo.getCid3() != null && jdGoods.getCommissionInfo() != null) {
+			Long cid3 = categoryInfo.getCid3();
+			JDGoodsClass threeClass = jdGoodsClassService.getThreeClassByCid(Integer.parseInt(cid3.toString()));
+			if (threeClass != null && threeClass.getSelfComm() != null
+					&& threeClass.getSelfComm().compareTo(new BigDecimal(0)) > 0) {
+				BigDecimal commissionShare = jdGoods.getCommissionInfo().getCommissionShare();
+				// plus姣斾緥 灏忎簬姝e父姣斾緥
+				if (commissionShare != null && commissionShare.compareTo(threeClass.getSelfComm()) > 0) {
+					jdGoods.setCommissionPlus(threeClass.getSelfComm());
+					// plus杩斿埄
+					BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
+							hongBaoManageService.getFanLiRate());
+					otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
+					// 浣跨敤濂栧姳鍒告渶楂樿繑
+					if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+						maxMoneyPlus = "锛堜含涓減lus杩斅�" + JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
+								hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP)) + "锛�";
+					} else
+						maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
+								+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
+								+ "锛�";
+				}
+			}
+		}
+
+		// 濂栧姳鍒歌繑鍒�
+		RewardCouponVO rewardCoupon = new RewardCouponVO();
+		rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
+		rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+		JSONObject params1 = new JSONObject();
+		if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+			params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+		else
+			params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+
+		rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+		if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+			rewardCoupon.setDesc("杩�");
+			params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+			rewardCoupon.getJumpDetail().setNeedLogin(true);
+		} else {
+			rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+		}
+		rewardCoupon.setParams(params1.toString());
+
+		otherInfo.setRewardCoupon(rewardCoupon);
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+				&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+			otherInfo.setRewardCoupon(null);
+
+		goodsDetail.setOtherInfo(otherInfo);
+
+		CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
+		if (couponInfo != null) {
+			// 鍒搁摼鎺ュ鐞�
+			String materialId = "https://item.jd.com/" + id + ".html";
+			String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
+					JDApiUtil.POSITION_COUPON + "", null);
+			couponInfo.setLink(url);
+		}
+
+		ShopInfoVO shopInfo = goodsDetail.getShopInfo();
+		if (shopInfo != null) {
+			if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null
+					|| shopInfo.getScoreSeller() == null) {
+				goodsDetail.setShopInfo(null);
+			}
+		}
+
 		GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();
 		extraVO.setIsNative(false);
 		// IOS鏄惁姝e湪涓婄嚎
@@ -606,7 +822,7 @@
 		List<ShamUser> listShareUser = new ArrayList<ShamUser>();
 
 		// 浜笢寮�鍚垎浜�
-		String open = configService.get("share_jd_open");
+		String open = configService.get(ConfigKeyEnum.shareOpenJD.getKey());
 		if ("1".equals(open.trim())) {
 			extraVO.setShareValid(true);
 			MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
@@ -637,8 +853,8 @@
 		}
 
 		// 鍥炬枃璇︽儏
-		extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/"+ id +".html");
-		
+		extraVO.setDetailUrl("https://in.m.jd.com/product/jieshao/video/" + id + ".html");
+
 		// 娴嬭瘯
 		SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
 				"goods_detail_jump_taobao");
@@ -647,28 +863,28 @@
 		}
 
 		// 鍟嗗搧閾炬帴
-		String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), jdGoods.getSkuId() + "", Constant.SOURCE_TYPE_JD);
-		try {
-			extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
-		} catch (Exception e) {
-			extraVO.setH5Url(h5Url);
-		}
+		String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePathJD(), "", id + "");
+		// try {
+		// extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+		// } catch (Exception e) {
+		extraVO.setH5Url(h5Url);
+		// }
 
 		String helpLink = null;
 		extraVO.setFanliValid(true);
 
 		if (StringUtil.isNullOrEmpty(helpLink)) {
-			helpLink = configService.get("no_rebate_help_link");
+			helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
 		}
 
-		// 鍒嗕韩璺緞
-		String shareUrl = String.format("%s?id=" + jdGoods.getSkuId(),
-				Constant.systemCommonConfig.getAppShareInfoUrl());
 		ShareVO shareInfoVO = new ShareVO();
-		shareInfoVO.setUrl(shareUrl);
 		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));
@@ -676,11 +892,18 @@
 		out.print(JsonUtil.loadTrueResult(object.toString()));
 
 		final JDGoods goods = jdGoods;
+		final Long fuid = uid;
 		ThreadUtil.run(new Runnable() {
 			public void run() {
 				// 娣诲姞娴忚璁板綍
 				try {
-					scanHistoryV2Service.addJDScanHistory(uid, acceptData.getDevice(), goods);
+					scanHistoryV2Service.addJDScanHistory(fuid, acceptData.getDevice(), goods);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+
+				try {
+					goodsEvaluateService.updateJDGoods(goods);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -689,7 +912,7 @@
 	}
 
 	/**
-	 * 浜笢鍟嗗搧璇︽儏
+	 * 鎷煎澶氬晢鍝佽鎯�
 	 * 
 	 * @param acceptData
 	 * @param id
@@ -697,7 +920,8 @@
 	 * @param from
 	 * @param out
 	 */
-	public void getPDDGoodsDetial(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+	@RequestMapping(value = "getDetailPDD", method = RequestMethod.POST)
+	public void getDetialPDD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
 		// 绯荤粺楠岃瘉
 		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
 				acceptData.getPackages());
@@ -712,9 +936,59 @@
 			return;
 		}
 
-		BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-		BigDecimal shareRate = hongBaoManageService.getShareRate();
-		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, null, fanLiRate, shareRate);
+		ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
+		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
+		if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+			goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			goodsDetail.getMoneyInfo().setShareMoney("楼" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods,
+					hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+			goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+			goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+		}
+		goodsDetail.getMoneyInfo()
+				.setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+		// 闄勫姞淇℃伅
+		OtherInfo otherInfo = new OtherInfo();
+		RewardCouponVO rewardCoupon = new RewardCouponVO();
+		rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+		JSONObject params1 = new JSONObject();
+		if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+			params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+		else
+			params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+
+		rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+		if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+			rewardCoupon.setDesc("杩�");
+			params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+			rewardCoupon.getJumpDetail().setNeedLogin(true);
+		} else
+			rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+		rewardCoupon.setParams(params1.toString());
+		otherInfo.setRewardCoupon(rewardCoupon);
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+				&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+			otherInfo.setRewardCoupon(null);
+		goodsDetail.setOtherInfo(otherInfo);
+
+		CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
+		PDDPromotionUrl convertUrl = null;
+		if (couponInfo != null) {
+			convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null);
+			if (convertUrl != null)
+				couponInfo.setLink(convertUrl.getUrl());
+		}
+
+		ShopInfoVO shopInfo = goodsDetail.getShopInfo();
+		if (shopInfo != null) {
+			if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null
+					|| shopInfo.getScoreSeller() == null) {
+				goodsDetail.setShopInfo(null);
+			}
+		}
 
 		GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();
 		extraVO.setIsNative(false);
@@ -724,24 +998,41 @@
 			extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version)));
 		}
 
-		
-		Long inOrderCount30Days = pddGoods.getSoldQuantity();
-		List<ShamUser> listShareUser = new ArrayList<ShamUser>();
-		MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
-		if (moneyInfo != null) {
-			String shareMoney = moneyInfo.getShareMoney().replaceAll("楼", "");
-			if (Integer.parseInt(inOrderCount30Days.toString()) >= 50000) {
-				listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney), 1, 5);
-			}
-		}
-		extraVO.setListShareUser(listShareUser);
+		// 鍥炬枃璇︽儏
+		extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);
 
-		// 棰嗗埜浜哄垪琛�
-		List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
-		if (goodsDetail.isHasCoupon() && Integer.parseInt(inOrderCount30Days.toString()) >= 50000) {
-			listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+		String salesTip = pddGoods.getSalesTip();
+		if (!StringUtil.isNullOrEmpty(salesTip)) {
+			int indexOf = salesTip.indexOf("+");
+			if (indexOf > 0) {
+				salesTip = salesTip.substring(0, indexOf);
+			}
+
+			int totalSales = 0;
+			if (salesTip.contains("涓�")) {
+				salesTip = salesTip.substring(0, salesTip.indexOf("涓�"));
+				totalSales = (int) (Float.parseFloat(salesTip) * 10000);
+			} else {
+				totalSales = Integer.parseInt(salesTip);
+			}
+
+			List<ShamUser> listShareUser = new ArrayList<ShamUser>();
+			MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
+			if (moneyInfo != null) {
+				String shareMoney = moneyInfo.getShareMoney().replaceAll("楼", "");
+				if (totalSales >= 50000) {
+					listShareUser = shamUserService.listRandShareUser(10, new BigDecimal(shareMoney), 1, 5);
+				}
+			}
+			extraVO.setListShareUser(listShareUser);
+
+			// 棰嗗埜浜哄垪琛�
+			List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
+			if (goodsDetail.isHasCoupon() && totalSales >= 50000) {
+				listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+			}
+			extraVO.setListCouponUser(listCouponUser);
 		}
-		extraVO.setListCouponUser(listCouponUser);
 
 		if (uid != null) {
 			// 鏄惁鍔犲叆鏀惰棌
@@ -752,35 +1043,37 @@
 			extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_PDD));
 		}
 
-		// 娴嬭瘯
-		SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
-				"goods_detail_jump_taobao");
-		if ("1".equalsIgnoreCase((params.getValue() + "").trim())) {
-			extraVO.setIsNative(true);
-		}
+		extraVO.setIsNative(true);
 
-		// 鍟嗗搧閾炬帴
-		String h5Url = String.format("http://%s%s?id=%s&appType=flq&goodsType=%s", configService.getH5Host(),
-				Constant.systemCommonConfig.getShareGoodsPagePath(), id + "", Constant.SOURCE_TYPE_PDD);
-		try {
-			extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
-		} catch (Exception e) {
-			extraVO.setH5Url(h5Url);
-		}
+		// 鍒嗕韩璺緞
+		String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
+		// try {
+		// extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+		// } catch (Exception e) {
+		extraVO.setH5Url(h5Url);
+		// }
 
 		String helpLink = null;
 		extraVO.setFanliValid(true);
 		extraVO.setShareValid(true);
 
 		if (StringUtil.isNullOrEmpty(helpLink)) {
-			helpLink = configService.get("no_rebate_help_link");
+			helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
 		}
-		// 鍒嗕韩璺緞
-		String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());
+
 		ShareVO shareInfoVO = new ShareVO();
-		shareInfoVO.setUrl(shareUrl);
 		shareInfoVO.setHelpLink(helpLink);
 		extraVO.setShare(shareInfoVO);
+
+		if (convertUrl != null) {
+			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));
@@ -795,115 +1088,906 @@
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
+
+				try {
+					goodsEvaluateService.updatePDDGoods(pddGoods);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * 鍞搧浼氳鎯�
+	 * 
+	 * @param acceptData
+	 * @param id
+	 * @param uid
+	 * @param from
+	 * @param out
+	 */
+	@RequestMapping(value = "getDetailVIP", method = RequestMethod.POST)
+	public void getDetialVIP(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+		// 绯荤粺楠岃瘉
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
+		if (system == null) {
+			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+			return;
+		}
+
+		VIPGoodsInfo vipGoodsInfo = VipShopApiUtil.getGoodsDetail(id + "");
+		if (vipGoodsInfo == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+			return;
+		}
+
+		ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
+		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertVIPGoods(vipGoodsInfo, paramsDTO);
+		if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+			goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			goodsDetail.getMoneyInfo().setShareMoney("楼" + VipShopUtil.getGoodsFanLiMoney(vipGoodsInfo,
+					hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+			goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+			goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+		}
+		goodsDetail.getMoneyInfo()
+				.setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+		// 闄勫姞淇℃伅
+		OtherInfo otherInfo = new OtherInfo();
+		RewardCouponVO rewardCoupon = new RewardCouponVO();
+		rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+		JSONObject params1 = new JSONObject();
+		if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+			params1.put("url", configService.get(ConfigKeyEnum.specialGuideRewardCouponLink.getKey()));
+		else
+			params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+
+		rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+		rewardCoupon.setDesc("杩�");
+		params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+		rewardCoupon.getJumpDetail().setNeedLogin(true);
+
+		rewardCoupon.setParams(params1.toString());
+		otherInfo.setRewardCoupon(rewardCoupon);
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+				&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+			otherInfo.setRewardCoupon(null);
+		goodsDetail.setOtherInfo(otherInfo);
+
+		ShopInfoVO shopInfo = goodsDetail.getShopInfo();
+		if (shopInfo != null) {
+			if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null
+					|| shopInfo.getScoreSeller() == null) {
+				goodsDetail.setShopInfo(null);
+			}
+		}
+
+		GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();
+		extraVO.setIsNative(false);
+		// IOS鏄惁姝e湪涓婄嚎
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+			String version = acceptData.getVersion();
+			extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version)));
+		}
+
+		// 鍥炬枃璇︽儏
+		extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);
+
+		if (uid != null) {
+			// 鏄惁鍔犲叆鏀惰棌
+			CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+					Constant.SOURCE_TYPE_VIP);
+			extraVO.setCollected(collectionGoods != null ? true : false);
+			// 鏄惁鍔犲叆閫夊搧搴�
+			extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_VIP));
+		}
+
+		extraVO.setIsNative(true);
+
+		// 鍒嗕韩璺緞
+		String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
+		// try {
+		// extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+		// } catch (Exception e) {
+		extraVO.setH5Url(h5Url);
+		// }
+
+		String helpLink = null;
+		extraVO.setFanliValid(true);
+		extraVO.setShareValid(true);
+
+		if (StringUtil.isNullOrEmpty(helpLink)) {
+			helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
+		}
+
+		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));
+		object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
+		out.print(JsonUtil.loadTrueResult(object.toString()));
+
+		ThreadUtil.run(new Runnable() {
+			public void run() {
+				// 娣诲姞娴忚璁板綍
+				try {
+					scanHistoryV2Service.addVIPScanHistory(uid, acceptData.getDevice(), vipGoodsInfo);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+
+				try {
+					goodsEvaluateService.updateVIPGoods(vipGoodsInfo);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	@RequestMapping(value = "getDetailSuning", method = RequestMethod.POST)
+	public void getDetialSuning(AcceptData acceptData, String id, Long uid, String from, PrintWriter out) {
+		// 绯荤粺楠岃瘉
+		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+				acceptData.getPackages());
+		if (system == null) {
+			out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+			return;
+		}
+
+		String[] ids = SuningUtil.getGoodsIdDetail(id);
+
+		SuningGoodsInfo suningGoodsInfo = SuningApiUtil.getGoodsDetail(ids[1], ids[0]);
+
+		if (suningGoodsInfo == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+			return;
+		}
+
+		ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid);
+		paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
+		GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertSuningGoods(suningGoodsInfo, paramsDTO);
+		if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+			goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+			goodsDetail.getMoneyInfo().setShareMoney("楼" + SuningUtil.getGoodsFanLiMoney(suningGoodsInfo,
+					hongBaoManageService.getShareRate(UserLevelEnum.superVIP)));
+			goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+			goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+		}
+		goodsDetail.getMoneyInfo()
+				.setRateInfoHelpUrl(configService.get(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey()));
+
+		// 闄勫姞淇℃伅
+		OtherInfo otherInfo = new OtherInfo();
+		RewardCouponVO rewardCoupon = new RewardCouponVO();
+		rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+		JSONObject params1 = new JSONObject();
+
+		params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+
+		rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+		rewardCoupon.setDesc("杩�");
+		params1.put("url", userVipConfigService.getValueByKey("vip_link"));
+		rewardCoupon.getJumpDetail().setNeedLogin(true);
+
+		rewardCoupon.setParams(params1.toString());
+		otherInfo.setRewardCoupon(rewardCoupon);
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+				&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+			otherInfo.setRewardCoupon(null);
+		goodsDetail.setOtherInfo(otherInfo);
+
+		ShopInfoVO shopInfo = goodsDetail.getShopInfo();
+		if (shopInfo != null) {
+			if (shopInfo.getId() == null || shopInfo.getScoreGoods() == null || shopInfo.getScoreLogistics() == null
+					|| shopInfo.getScoreSeller() == null) {
+				goodsDetail.setShopInfo(null);
+			}
+		}
+
+		GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();
+		extraVO.setIsNative(false);
+		// IOS鏄惁姝e湪涓婄嚎
+		if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+			String version = acceptData.getVersion();
+			extraVO.setIosOnling(configService.iosOnLining(Integer.parseInt(version)));
+		}
+
+		// 鍥炬枃璇︽儏
+		extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_suning.html?id="
+				+ suningGoodsInfo.getCommodityInfo().getCommodityCode() + "&supplierCode="
+				+ suningGoodsInfo.getCommodityInfo().getSupplierCode());
+
+		if (uid != null) {
+			// 鏄惁鍔犲叆鏀惰棌
+			CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid,
+					Long.parseLong(suningGoodsInfo.getCommodityInfo().getCommodityCode()), Constant.SOURCE_TYPE_SUNING);
+			extraVO.setCollected(collectionGoods != null ? true : false);
+			// 鏄惁鍔犲叆閫夊搧搴�
+			extraVO.setStorage(userGoodsStorageService.isExistStorage(uid,
+					Long.parseLong(suningGoodsInfo.getCommodityInfo().getCommodityCode()),
+					Constant.SOURCE_TYPE_SUNING));
+		}
+
+		extraVO.setIsNative(true);
+
+		// 鍒嗕韩璺緞
+		String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(),
+				Constant.systemCommonConfig.getShareGoodsPagePathPDD(), "", id + "");
+		// try {
+		// extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+		// } catch (Exception e) {
+		extraVO.setH5Url(h5Url);
+		// }
+
+		String helpLink = null;
+		extraVO.setFanliValid(true);
+		extraVO.setShareValid(true);
+
+		if (StringUtil.isNullOrEmpty(helpLink)) {
+			helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());
+		}
+
+		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));
+		object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
+		out.print(JsonUtil.loadTrueResult(object.toString()));
+
+		ThreadUtil.run(new Runnable() {
+			public void run() {
+				// 娣诲姞娴忚璁板綍
+				try {
+					scanHistoryV2Service.addSuningScanHistory(uid, acceptData.getDevice(), suningGoodsInfo);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+
+				try {
+					goodsEvaluateService.updateSuningGoods(suningGoodsInfo);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 		});
 	}
 	
-	
 	/**
-	 * 鍟嗗搧璇︽儏鎺ㄨ崘锛堢寽浣犲枩娆�  +  鎺ㄨ崘锛�
+	 * 	// 浜戝彂鍗曟枃妗堜俊鎭�
+	 * @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);
+			}
+		}
+	}
+
+	/**
+	 * 鍟嗗搧璇︽儏鎺ㄨ崘锛堢寽浣犲枩娆� + 鎺ㄨ崘锛�
 	 * 
 	 * @param acceptData
 	 * @param id
 	 * @param out
 	 */
 	@RequestMapping(value = "getRecommendGoods", method = RequestMethod.POST)
-	public void getRecommendGoods(AcceptData acceptData, long id, Integer goodsType, PrintWriter out) {
+	public void getRecommendGoods(AcceptData acceptData, String 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 (goodsType == Constant.SOURCE_TYPE_JD) {
+				JSONObject data = new JSONObject();
+				data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
 
-		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();
-					}
+				List<JDGoods> list = JDUtil.getRecommendGoodsById(Long.parseLong(id));
+				if (list == null) {
+					list = new ArrayList<JDGoods>();
+				} else if (list.size() > 10) {
+					list = list.subList(0, 10);
+				}
 
-					if (taoBaoGoodsBrief == null) {
-						TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
-						goods.setCouponInfo(newGoods.getCouponInfo());
-						goods.setCouponLink(newGoods.getCouponLink());
-						goods.setTkRate(newGoods.getTkRate());
-						taoBaoGoodsBrief = goods;
-					}
+				ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null);
+				List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
 
-					if (taoBaoGoodsBrief != null) {
-						listExtra.add(GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate));
+				for (JDGoods goods : list) {
+					listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO));
+				}
+
+				// 鍙栧伓鏁颁釜鏁版嵁
+				if (listDetailVO.size() % 2 != 0) {
+					listDetailVO.remove(listDetailVO.size() - 1);
+				}
+
+				data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO));
+				out.print(JsonUtil.loadTrueResult(data));
+				return;
+			}
+
+			// 鎷煎澶�
+			if (goodsType == Constant.SOURCE_TYPE_PDD) {
+				JSONObject data = new JSONObject();
+				data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
+
+				List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
+
+				List<Long> goodsIdList = PinDuoDuoUtil.getRecommendGoodsId(Long.parseLong(id));
+				if (goodsIdList != null && goodsIdList.size() > 0) {
+					PDDSearchFilter pddfilter = new PDDSearchFilter();
+					pddfilter.setPage(1);
+					pddfilter.setPageSize(Constant.PAGE_SIZE);
+					Long[] strings = new Long[goodsIdList.size()];
+					pddfilter.setGoodsIdList(goodsIdList.toArray(strings));
+
+					PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+					if (result != null) {
+						List<PDDGoodsDetail> goodsList = result.getGoodsList();
+						if (goodsList != null && goodsList.size() > 0) {
+
+							if (goodsList.size() > 10) {
+								goodsList = goodsList.subList(0, 10);
+							}
+
+							ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(),
+									null);
+							for (PDDGoodsDetail goods : goodsList) {
+								listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
+							}
+						}
 					}
 				}
+
+				// 鍙栧伓鏁颁釜鏁版嵁
+				if (listDetailVO.size() % 2 != 0) {
+					listDetailVO.remove(listDetailVO.size() - 1);
+				}
+
+				data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listDetailVO));
+				out.print(JsonUtil.loadTrueResult(data));
+				return;
+			}
+
+			// 鍞搧浼�
+			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) {
+				goodsList = new ArrayList<TaoBaoGoodsBrief>();
+			}
+
+			List<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>();
+			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>();
+			// 鍙栧伓鏁颁釜鏁版嵁
+			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));
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+			JSONObject data = new JSONObject();
+			data.put("listQuality", new JSONArray());
+			data.put("listGuess", new JSONArray());
+			out.print(JsonUtil.loadTrueResult(data));
 		}
-		
-		
-		List<GoodsDetailVO> listQuality = new ArrayList<GoodsDetailVO>();
-		// 鍙栧伓鏁颁釜鏁版嵁
-		if (listExtra.size() % 2 != 0) {
-			listExtra.remove(listExtra.size() - 1);
+	}
+
+	/**
+	 * 浜笢璐拱閾炬帴
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param id
+	 * @param couponUrl
+	 *            -浼樻儬鍒搁摼鎺�
+	 * @param source
+	 * @param out
+	 */
+	@RequestMapping(value = "getJDLink")
+	public void getJDLink(AcceptData acceptData, Long uid, Long id, String couponUrl, String source, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
+			return;
 		}
 
-		if (listQuality.size() % 2 != 0) {
-			listQuality.remove(listQuality.size() - 1);
+		if (id == null || id <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+		if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+			out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+			return;
+		}
+
+		JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(id);
+		if (goods == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+			return;
+		}
+
+		String jumpLink = null;
+		String materialId = "https://item.jd.com/" + id + ".html";
+		if (StringUtil.isNullOrEmpty(couponUrl)) {
+			JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());
+			if (couponInfo != null) {
+				couponUrl = couponInfo.getLink();
+			}
+			jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+					uid + "");
+			if (jumpLink == null) {
+				jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, JDApiUtil.POSITION_FANLI + "",
+						uid + "");
+			}
+		} else {
+			jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+					uid + "");
+			if (StringUtil.isNullOrEmpty(jumpLink)) {
+				jumpLink = couponUrl;
+			}
 		}
 
 		JSONObject data = new JSONObject();
-		data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
-		data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
+		data.put("native", true);
+		data.put("jumpLink", jumpLink);
+		out.print(JsonUtil.loadTrueResult(data));
+
+		// 鑾峰緱閲戝竵
+		integralGetService.addCouponRebate(uid);
+	}
+
+	@RequestMapping(value = "getJDCouponLink")
+	public void getJDCouponLink(AcceptData acceptData, Long id, String couponUrl, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(couponUrl)) {
+			out.print(JsonUtil.loadFalseResult(1, "鍒搁摼鎺ヤ笉鑳戒负绌�"));
+			return;
+		}
+		if (id == null || id <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		String jumpLink = null;
+		String materialId = "https://item.jd.com/" + id + ".html";
+
+		jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", null);
+		if (StringUtil.isNullOrEmpty(jumpLink)) {
+			jumpLink = couponUrl;
+		}
+
+		JSONObject data = new JSONObject();
+		data.put("native", true);
+		data.put("jumpLink", jumpLink);
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
+	/**
+	 * 鎷煎澶氳喘涔伴摼鎺�
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param id
+	 * @param source
+	 * @param request
+	 * @param out
+	 */
+	@RequestMapping(value = "getPDDLink")
+	public void getPDDLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		if (id == null || id <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+		if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+			out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+			return;
+		}
+
+		PDDGoodsDetail goods = pinDuoDuoCacheUtil.getGoodsInfo(id);
+		if (goods == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+			return;
+		}
+
+		PDDPromotionUrl convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_FANLI + "", uid + "");
+		JSONObject data = new JSONObject();
+		data.put("native", true);
+
+		data.put("jumpLink", convertUrl.getUrl());
+		data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
+		out.print(JsonUtil.loadTrueResult(data));
+
+		// 鑾峰緱閲戝竵
+		integralGetService.addCouponRebate(uid);
+	}
+
+	/**
+	 * 鎷煎澶氳喘涔伴摼鎺�
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param id
+	 * @param source
+	 * @param request
+	 * @param out
+	 */
+	@RequestMapping(value = "getVIPLink")
+	public void getVIPLink(AcceptData acceptData, Long uid, Long id, String source, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		if (id == null || id <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+		if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+			out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+			return;
+		}
+
+		VIPGoodsInfo goods = VipShopApiUtil.getGoodsDetail(id + "");
+		if (goods == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+			return;
+		}
+
+		VIPConvertResultDTO convertUrl = VipShopApiUtil.convertLink(id + "", VipShopUtil.getBuyChanTag(uid));
+		JSONObject data = new JSONObject();
+		data.put("native", true);
+		data.put("jumpLink", convertUrl.getUrl());
+		data.put("nativeJumpLink", convertUrl.getDeeplinkUrl());
+		out.print(JsonUtil.loadTrueResult(data));
+
+		// 鑾峰緱閲戝竵
+		integralGetService.addCouponRebate(uid);
+	}
+
+	@RequestMapping(value = "getSuningLink")
+	public void getSuningLink(AcceptData acceptData, Long uid, String id, String source, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		if (StringUtil.isNullOrEmpty(id)) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+		if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+			out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+			return;
+		}
+
+		String[] sts = SuningUtil.getGoodsIdDetail(id);
+		String supplierCode = sts[0];
+		String goodsCode = sts[1];
+
+		SuningGoodsInfo goods = SuningApiUtil.getGoodsDetail(goodsCode, supplierCode);
+		if (goods == null) {
+			out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+			return;
+		}
+
+		String quanUrl = null;
+		if (!StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl()))
+			quanUrl = goods.getCouponInfo().getCouponUrl();
+		String link = SuningApiUtil.convertLink(SuningUtil.getProductUrl(supplierCode, goodsCode), quanUrl,
+				SuningApiUtil.PID_BUY, uid + "");
+		JSONObject data = new JSONObject();
+		data.put("native", false);
+		data.put("jumpLink", link);
+		out.print(JsonUtil.loadTrueResult(data));
+
+		// 鑾峰緱閲戝竵
+		integralGetService.addCouponRebate(uid);
+	}
+
+	/**
+	 * 鏄惁鍦ㄥ弬涓庢帹骞�
+	 * 
+	 * @param goodsId
+	 *            -鍟嗗搧ID
+	 * @param goodsType
+	 *            -TB/JD
+	 * @param out
+	 */
+	@RequestMapping(value = "isGoodsExtend")
+	public void isGoodsExtend(AcceptData acceptData, String goodsId, Integer goodsType, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(goodsId)) {
+			out.print(JsonUtil.loadFalseResult(1, "鏈弬涓庢帹骞�"));
+			return;
+		}
+		if (goodsType == null) {
+			out.print(JsonUtil.loadFalseResult(2, "缂哄皯goodsType"));
+			return;
+		}
+		JSONObject data = new JSONObject();
+		if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+			TaoBaoGoodsBrief goods = null;
+			try {
+				goods = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(goodsId));
+			} catch (NumberFormatException e) {
+				e.printStackTrace();
+			} catch (TaobaoGoodsDownException e) {
+				e.printStackTrace();
+			}
+
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url", "https://h5.m.taobao.com/awp/core/detail.htm?id=" + goodsId);
+			} else {
+				data.put("extend", true);
+			}
+
+		} else if (goodsType == Constant.SOURCE_TYPE_JD) {
+			JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId));
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url", String.format("https://item.m.jd.com/product/%s.html", goodsId));
+			} else {
+				data.put("extend", true);
+			}
+		} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+			PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId));
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url", String.format("https://mobile.yangkeduo.com/goods.html?goods_id=%s", goodsId));
+			} else {
+				data.put("extend", true);
+			}
+		} else if (goodsType == Constant.SOURCE_TYPE_VIP) {
+			VIPGoodsInfo goods = VipShopApiUtil.getGoodsDetail(goodsId);
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url","");
+			} else {
+				data.put("extend", true);
+			}
+		} else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+			SuningGoodsInfo goods = SuningApiUtil.getGoodsDetail(goodsId.split("-")[1], goodsId.split("-")[0]);
+			if (goods == null) {
+				data.put("extend", false);
+				data.put("url", String.format("https://m.suning.com/product/%s/%s.html", goodsId.split("-")[0],goodsId.split("-")[1]));
+			} else {
+				data.put("extend", true);
+			}
+		}
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+
+	@RequestMapping(value = "listSimpleGoods", method = RequestMethod.POST)
+	public void listSimpleGoods(AcceptData acceptData, String goodsInfo, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(goodsInfo)) {
+			out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧淇℃伅涓虹┖"));
+			return;
+		}
+
+		net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(goodsInfo);
+
+		List<CommonGoods> commonGoodsList = new ArrayList<>();
+
+		for (int i = 0; i < array.size(); i++) {
+			JSONObject obj = array.optJSONObject(i);
+			CommonGoods cg = new CommonGoods();
+			cg.setGoodsId(obj.optLong("goodsId"));
+			cg.setGoodsType(obj.optInt("goodsType"));
+			commonGoodsList.add(cg);
+		}
+
+		if (commonGoodsList.size() > 9) {
+			out.print(JsonUtil.loadFalseResult(1, "鏈�澶氬悓鏃惰幏鍙�9鏉℃暟鎹�"));
+			return;
+		}
+
+		// 鍒嗙鍚勪釜骞冲彴鐨勫晢鍝佷俊鎭�
+		List<Long> tbGoodsList = new ArrayList<>();
+		List<Long> jdGoodsList = new ArrayList<>();
+		List<Long> pddGoodsList = new ArrayList<>();
+
+		List<String> keyList = new ArrayList<>();
+
+		for (CommonGoods cg : commonGoodsList) {
+			keyList.add(cg.getGoodsId() + "-" + cg.getGoodsType());
+			if (cg.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+				tbGoodsList.add(cg.getGoodsId());
+			} else if (cg.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+				jdGoodsList.add(cg.getGoodsId());
+			} else if (cg.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+				pddGoodsList.add(cg.getGoodsId());
+			}
+		}
+
+		Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
+
+		ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+				hongBaoManageService.getShareRate(), new BigDecimal(80),
+				hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
+
+		if (tbGoodsList.size() > 0) {
+			List<TaoBaoGoodsBrief> goodsList = null;
+			try {
+				goodsList = TaoKeApiUtil.getBatchGoodsInfo(tbGoodsList);
+			} catch (TaobaoGoodsDownException e) {
+				e.printStackTrace();
+			} catch (TaoKeApiException e) {
+				e.printStackTrace();
+			}
+			if (goodsList != null)
+				for (TaoBaoGoodsBrief goods : goodsList) {
+					goods.setTkRate(new BigDecimal(0));
+					tempGoodsList.put(goods.getAuctionId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+							GoodsDetailVOFactory.convertTaoBao(goods, params));
+				}
+		}
+		if (jdGoodsList.size() > 0) {
+			List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
+			for (JDGoods goods : goodsList) {
+				tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,
+						GoodsDetailVOFactory.convertJDGoods(goods, params));
+			}
+		}
+		if (pddGoodsList.size() > 0) {
+			List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);
+			for (PDDGoodsDetail goods : goodsList) {
+				tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_PDD,
+						GoodsDetailVOFactory.convertPDDGoods(goods, params));
+			}
+		}
+		List<GoodsDetailVO> voList = new ArrayList<>();
+		Gson gson = JsonUtil.getApiCommonGson();
+		for (String key : keyList) {
+			GoodsDetailVO vo = tempGoodsList.get(key);
+			if (vo != null) {
+				voList.add(vo);
+			}
+		}
+		out.print(JsonUtil.loadTrueResult(gson.toJson(voList)));
+	}
+
+	/**
+	 * 浜笢杞摼
+	 * @Title: getJDLink
+	 * @Description: 
+	 * @param acceptData
+	 * @param link
+	 * @param uid
+	 * @param out 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	@RequestMapping(value = "convertJDLink")
+	public void convertJDLink(AcceptData acceptData, String link, Long uid, String callback, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(link)) {
+			out.print(JsonUtil.loadFalseResult(1, "閾炬帴涓虹┖"));
+			return;
+		}
+
+		link = JDApiUtil.convertLinkWithSubUnionId(link, null, JDApiUtil.POSITION_FANLI + "", uid + "");
+
+		JSONObject data = new JSONObject();
+		data.put("link", link);
+		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+	}
 
 }

--
Gitblit v1.8.0