From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 609 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 545 insertions(+), 64 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 5c72db0..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
@@ -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;
@@ -25,11 +24,19 @@
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.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;
@@ -95,9 +102,13 @@
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.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;
@@ -243,12 +254,12 @@
}
String link = taoBaoGoodsCacheUtil.getBaseConvertLink(goods.getAuctionId(), dpid);
if (!StringUtil.isNullOrEmpty(link)) {
-// result.getGoods().setCouponLink(link);
+ // result.getGoods().setCouponLink(link);
return result.getGoods();
} else {
link = DaTaoKeApiUtil.convertLink(goods.getAuctionId(), dpid);
if (!StringUtil.isNullOrEmpty(link)) {
-// result.getGoods().setCouponLink(link);
+ // result.getGoods().setCouponLink(link);
taoBaoGoodsCacheUtil.cacheBaseConvertLink(goods.getAuctionId(), dpid, link);
}
return result.getGoods();
@@ -443,7 +454,7 @@
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)));
+ hongBaoManageService.getShareRate(UserLevelEnum.superVIP), true));
goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
}
@@ -545,7 +556,8 @@
shareValid = false;
helpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());
- BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,
+ false);
ReduceHongBao reduceHongBao = new ReduceHongBao();
reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());
@@ -646,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));
@@ -847,11 +865,11 @@
// 鍟嗗搧閾炬帴
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);
- }
+ // try {
+ // extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+ // } catch (Exception e) {
+ extraVO.setH5Url(h5Url);
+ // }
String helpLink = null;
extraVO.setFanliValid(true);
@@ -863,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));
@@ -1026,11 +1048,11 @@
// 鍒嗕韩璺緞
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);
- }
+ // try {
+ // extraVO.setH5Url(HttpUtil.getShortLink(h5Url));
+ // } catch (Exception e) {
+ extraVO.setH5Url(h5Url);
+ // }
String helpLink = null;
extraVO.setFanliValid(true);
@@ -1047,6 +1069,10 @@
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();
@@ -1073,6 +1099,321 @@
}
/**
+ * 鍞搧浼氳鎯�
+ *
+ * @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鏄惁姝ｅ湪涓婄嚎
+ 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鏄惁姝ｅ湪涓婄嚎
+ 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
@@ -1080,19 +1421,18 @@
* @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;
}
try {
-
// 浜笢
if (goodsType == Constant.SOURCE_TYPE_JD) {
JSONObject data = new JSONObject();
data.put("listGuess", JsonUtil.getApiCommonGson().toJson(new ArrayList<GoodsDetailVO>()));
- List<JDGoods> list = JDUtil.getRecommendGoodsById(id);
+ List<JDGoods> list = JDUtil.getRecommendGoodsById(Long.parseLong(id));
if (list == null) {
list = new ArrayList<JDGoods>();
} else if (list.size() > 10) {
@@ -1123,7 +1463,7 @@
List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
- List<Long> goodsIdList = PinDuoDuoUtil.getRecommendGoodsId(id);
+ List<Long> goodsIdList = PinDuoDuoUtil.getRecommendGoodsId(Long.parseLong(id));
if (goodsIdList != null && goodsIdList.size() > 0) {
PDDSearchFilter pddfilter = new PDDSearchFilter();
pddfilter.setPage(1);
@@ -1159,57 +1499,63 @@
return;
}
- List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 10);
+ // 鍞搧浼�
+ 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>();
- 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>();
// 鍙栧伓鏁颁釜鏁版嵁
@@ -1285,6 +1631,9 @@
} else {
jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
uid + "");
+ if (StringUtil.isNullOrEmpty(jumpLink)) {
+ jumpLink = couponUrl;
+ }
}
JSONObject data = new JSONObject();
@@ -1311,6 +1660,9 @@
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);
@@ -1358,6 +1710,93 @@
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));
// 鑾峰緱閲戝竵
@@ -1414,6 +1853,22 @@
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);
}
@@ -1509,4 +1964,30 @@
}
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