From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 一月 2024 17:17:55 +0800
Subject: [PATCH] 抖音转链修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 746 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 590 insertions(+), 156 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 695f55f..cd4dc41 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
@@ -1,20 +1,36 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.net.URLEncoder;
+import java.util.*;
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.entity.SystemPIDInfo;
+import com.yeshi.fanli.exception.pdd.PDDApiException;
+import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
+import com.yeshi.fanli.lijin.manager.UserLijinMnager;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
+import com.yeshi.fanli.service.inter.user.*;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.goods.GoodsJumpUtil;
+import com.yeshi.fanli.util.goods.douyin.CSJCPSApiUtil;
+import com.yeshi.fanli.util.goods.douyin.DYUtil;
+import com.yeshi.fanli.util.goods.douyin.vo.*;
+import com.yeshi.fanli.vo.common.WXXCXJumpInfoVO;
+import com.yeshi.fanli.vo.pdd.PDDConvertLinkResultVO;
+import com.yeshi.fanli.vo.goods.GoodsJumpLinkVO;
+import com.yeshi.fanli.vo.suning.SuningConvertLinkResult;
+import com.yeshi.goods.facade.dto.taobao.TaoBaoGoodsImportantInfo;
import org.json.simple.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,12 +38,11 @@
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
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;
@@ -67,24 +82,15 @@
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.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.goods.facade.service.DaTaoKeGoodsDetailV2Service;
-import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
-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.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;
@@ -125,6 +131,9 @@
@Controller
@RequestMapping("api/v2/goods")
public class GoodsControllerV2 {
+
+
+ Logger logger = LoggerFactory.getLogger(GoodsControllerV2.class);
@Resource
private BusinessSystemService businessSystemService;
@@ -215,7 +224,19 @@
@Resource
private PDDAuthService pddAuthService;
- private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid, SystemEnum system) {
+ @Resource
+ private GoodsLijinMnager goodsLijinMnager;
+
+ @Resource
+ private PIDManager pidManager;
+
+ @Resource
+ private UserLijinMnager userLijinMnager;
+
+ @Resource
+ private UserFunctionsLimitService userFunctionsLimitService;
+
+ private GoodsMoneyConfigParamsDTO getParamsDTO(String platform, String version, Long uid, SystemEnum system) {
UserLevelEnum level = UserLevelEnum.daRen;
if (uid != null && uid > 0) {
level = userLevelManager.getUserLevel(uid);
@@ -230,7 +251,10 @@
return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level, system);
}
- private TaoBaoGoodsBrief filterDaTaoKeGoodsInfo(TaoBaoGoodsBrief goods) {
+ private TaoBaoGoodsBrief filterDaTaoKeGoodsInfo(SystemEnum system, TaoBaoGoodsBrief goods) {
+ String specialPid = pidManager.getPidCache(system, Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli);
+ String relationPid = pidManager.getPidCache(system, Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanliChannel);
+
try {
DaTaoKeFilterResult result = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
if (result.getFilterType() == DaTaoKeFilterResult.FILTER_TYPE_COUPON
@@ -238,16 +262,16 @@
// 缂撳瓨鍩虹閾炬帴
String dpid = null;
if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
- dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+ dpid = specialPid;
} else {
- dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
+ dpid = relationPid;
}
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);
+ link = DaTaoKeApiUtil.convertLink(goods.getAuctionId(), dpid, false);
if (!StringUtil.isNullOrEmpty(link)) {
// result.getGoods().setCouponLink(link);
taoBaoGoodsCacheUtil.cacheBaseConvertLink(goods.getAuctionId(), dpid, link);
@@ -272,11 +296,13 @@
* @param out
*/
@RequestMapping(value = "getDetailTB", method = RequestMethod.POST)
- public void getDetialTB(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+ public void getDetialTB(AcceptData acceptData, String id, Long uid, String from, PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id涓嶈兘涓虹┖"));
return;
}
+
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-寮�濮嬶細{}", id + "");
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages(), acceptData.getSystem());
@@ -315,6 +341,7 @@
TaoBaoGoodsBrief goods = null;
if (!convertInServer) {
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-涓嶅湪鏈嶅姟绔浆閾撅細{}", id + "");
try {
goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);
if (goods == null) {
@@ -393,7 +420,12 @@
});
}
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-鑾峰彇鍟嗗搧璇︽儏鎴愬姛锛歿}", id + "");
+
TaoBaoGoodsBrief tb = goods;
+
+ //鍒涘缓鏃堕棿璁剧疆涓虹┖锛岄槻姝㈠墠绔敤long瑙ｆ瀽
+ tb.setCreatetime(null);
if (tb == null) {
@@ -409,7 +441,7 @@
if (uid != null && uid > 0) {
String specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
//鑾峰彇鏈�鏂扮殑姣斾緥
- TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCoupon(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(), specialId, null);
+ TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCoupon(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli)), specialId, null);
if (rateGoods != null)
tb.setMinTkRate(rateGoods.getTkRate());
}
@@ -438,15 +470,21 @@
tb.setImgList(finalImgList);
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-寮�濮嬪ぇ娣樺鍟嗗搧杩囨护锛歿}", id + "");
+
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = filterDaTaoKeGoodsInfo(goods);
+ goods = filterDaTaoKeGoodsInfo(acceptData.getSystem(), goods);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-缁撴潫澶ф窐瀹㈠晢鍝佽繃婊わ細{}", id + "");
+
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
+
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-鑾峰彇鍒拌繑鍒╂瘮渚嬶細{}", id + "");
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
@@ -477,6 +515,8 @@
}
goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop));
}
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-鑾峰彇搴楅摵淇℃伅缁撴潫锛歿}", id + "");
+
// 鍏嶅崟鍟嗗搧
if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {
@@ -504,6 +544,8 @@
}
extraVO.setListShareUser(listShareUser);
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-鍒嗕韩璧氫汉鎻愮ず缁撴潫锛歿}", id + "");
+
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
@@ -514,13 +556,17 @@
}
extraVO.setListCouponUser(listCouponUser);
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 棰嗗埜浜哄垪琛ㄧ粨鏉燂細{}", id + "");
+
if (uid != null) {
// 鏄惁鍔犲叆鏀惰棌
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
Constant.SOURCE_TYPE_TAOBAO);
extraVO.setCollected(collectionGoods != null ? true : false);
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 鏀惰棌缁撴潫锛歿}", id + "");
// 鏄惁鍔犲叆閫夊搧搴�
extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_TAOBAO));
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 閫夊搧搴撶粨鏉燂細{}", id + "");
}
// 娴嬭瘯
@@ -608,9 +654,10 @@
goodsDetail.setLabels(labels);
} else {// 鏅�氳喘涔�
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 濂栧姳鍒稿紑濮嬶細{}", id + "");
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
JSONObject params1 = new JSONObject();
if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -626,10 +673,10 @@
rewardCoupon.setParams(params1.toString());
otherInfo.setRewardCoupon(rewardCoupon);
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 濂栧姳鍒哥粨鏉燂細{}", id + "");
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()), acceptData.getSystem()))
otherInfo.setRewardCoupon(null);
-
goodsDetail.setOtherInfo(otherInfo);
}
extraVO.setFanliValid(fanliValid);
@@ -657,15 +704,20 @@
goodsDetail.setCouponInfoList(couponInfoList);
}
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏- 鍒嗕韩淇℃伅缁撴潫锛歿}", id + "");
- if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
- }
+//浜戝彂鍗曞叧闂�
+// if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+// getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 浜戝彂鍗曟枃妗堜俊鎭�
+// logger.debug("鑾峰彇鍟嗗搧璇︽儏- 浜戝彂鍗曟枃妗堢粨鏉燂細{}", id + "");
+// }
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
out.print(JsonUtil.loadTrueResult(object.toString()));
+
+ logger.debug("鑾峰彇鍟嗗搧璇︽儏-璇︽儏缁撴潫锛歿}", id + "");
final TaoBaoGoodsBrief goodsInfo = tb;
ThreadUtil.run(new Runnable() {
@@ -720,7 +772,7 @@
// 淇濆瓨缂撳瓨
jdGoodsCacheUtil.saveGoodsInfo(jdGoods);
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
@@ -767,7 +819,7 @@
// 濂栧姳鍒歌繑鍒�
RewardCouponVO rewardCoupon = new RewardCouponVO();
rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
JSONObject params1 = new JSONObject();
if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -795,8 +847,13 @@
if (couponInfo != null) {
// 鍒搁摼鎺ュ鐞�
String materialId = "https://item.jd.com/" + id + ".html";
- String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(), null,
- JDApiUtil.POSITION_COUPON + "", null);
+ String url = null;
+ try {
+ url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(), null,
+ pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.coupon), null);
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponInfo.getLink()), e);
+ }
couponInfo.setLink(url);
}
@@ -843,11 +900,11 @@
if (uid != null) {
// 鏄惁鍔犲叆鏀惰棌
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id + "",
Constant.SOURCE_TYPE_JD);
extraVO.setCollected(collectionGoods != null ? true : false);
// 鏄惁鍔犲叆閫夊搧搴�
- extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_JD));
+ extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id + "", Constant.SOURCE_TYPE_JD));
}
// 鍥炬枃璇︽儏
@@ -928,13 +985,26 @@
return;
}
- PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, PinDuoDuoApiUtil.PID_FANLI, pddAuthService.getFanliCustomParams(uid));
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.fanli);
+
+ PDDGoodsDetail pddGoods = null;
+ try {
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, pid, pddAuthService.getFanliCustomParams(uid));
+ } catch (PDDApiException e) {
+ e.printStackTrace();
+ if (e.getCode() == PDDApiException.CODE_NOT_AUTH) {
+ try {
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id, pid, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
+ } catch (PDDApiException e1) {
+ }
+ }
+ }
if (pddGoods == null) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
return;
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
@@ -951,7 +1021,7 @@
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
JSONObject params1 = new JSONObject();
if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -973,9 +1043,9 @@
goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
- PDDPromotionUrl convertUrl = null;
+ PDDConvertLinkResultVO convertUrl = null;
if (couponInfo != null) {
- convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_COUPON + "", null, false);
+ convertUrl = PinDuoDuoApiUtil.convert(pddGoods.getGoodsSign(), pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.coupon), null, false);
if (convertUrl != null)
couponInfo.setLink(convertUrl.getUrl());
}
@@ -1034,11 +1104,11 @@
if (uid != null) {
// 鏄惁鍔犲叆鏀惰棌
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id + "",
Constant.SOURCE_TYPE_PDD);
extraVO.setCollected(collectionGoods != null ? true : false);
// 鏄惁鍔犲叆閫夊搧搴�
- extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_PDD));
+ extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id + "", Constant.SOURCE_TYPE_PDD));
}
extraVO.setIsNative(true);
@@ -1097,17 +1167,18 @@
object.put("goods", JsonUtil.getApiCommonGson().toJson(goodsDetail));
out.print(JsonUtil.loadTrueResult(object.toString()));
+ final PDDGoodsDetail fGoods = pddGoods;
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
try {
- scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), pddGoods);
+ scanHistoryV2Service.addPDDScanHistory(uid, acceptData.getDevice(), fGoods);
} catch (Exception e) {
e.printStackTrace();
}
try {
- goodsEvaluateService.updatePDDGoods(pddGoods);
+ goodsEvaluateService.updatePDDGoods(fGoods);
} catch (Exception e) {
e.printStackTrace();
}
@@ -1140,7 +1211,7 @@
return;
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertVIPGoods(vipGoodsInfo, paramsDTO);
@@ -1157,7 +1228,7 @@
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
JSONObject params1 = new JSONObject();
if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -1197,11 +1268,11 @@
if (uid != null) {
// 鏄惁鍔犲叆鏀惰棌
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ 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.setStorage(userGoodsStorageService.isExistStorage(uid, id + "", Constant.SOURCE_TYPE_VIP));
}
extraVO.setIsNative(true);
@@ -1280,7 +1351,7 @@
return;
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertSuningGoods(suningGoodsInfo, paramsDTO);
@@ -1297,7 +1368,7 @@
// 闄勫姞淇℃伅
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
- rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
JSONObject params1 = new JSONObject();
params1.put("url", userVipConfigService.getValueByKey("vip_link"));
@@ -1338,11 +1409,11 @@
if (uid != null) {
// 鏄惁鍔犲叆鏀惰棌
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid,
- Long.parseLong(suningGoodsInfo.getCommodityInfo().getCommodityCode()), Constant.SOURCE_TYPE_SUNING);
+ (suningGoodsInfo.getCommodityInfo().getCommodityCode()), Constant.SOURCE_TYPE_SUNING);
extraVO.setCollected(collectionGoods != null ? true : false);
// 鏄惁鍔犲叆閫夊搧搴�
extraVO.setStorage(userGoodsStorageService.isExistStorage(uid,
- Long.parseLong(suningGoodsInfo.getCommodityInfo().getCommodityCode()),
+ (suningGoodsInfo.getCommodityInfo().getCommodityCode()),
Constant.SOURCE_TYPE_SUNING));
}
@@ -1403,12 +1474,154 @@
});
}
+
+ @RequestMapping(value = "getDetailDY", method = RequestMethod.POST)
+ public void getDetailDY(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
+ // 绯荤粺楠岃瘉
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages(), acceptData.getSystem());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ DYGoodsDetail dyGoodsDetail = CSJCPSApiUtil.goodsDetail(id);
+ if (dyGoodsDetail == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+ return;
+ }
+
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), uid, acceptData.getSystem());
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(acceptData.getSystem()));
+
+ GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertDYGoods(dyGoodsDetail, paramsDTO);
+ if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {
+ goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());
+ goodsDetail.getMoneyInfo().setShareMoney("楼" + DYUtil.getGoodsFanLiMoney(dyGoodsDetail,
+ hongBaoManageService.getShareRate(UserLevelEnum.superVIP, acceptData.getSystem())));
+ goodsDetail.getMoneyInfo().setRateInfo(goodsDetail.getMoneyInfo().getMaxRateInfo());
+ goodsDetail.getMoneyInfo().setCompositionInfo(goodsDetail.getMoneyInfo().getMaxCompositionInfo());
+ }
+ goodsDetail.getMoneyInfo()
+ .setRateInfoHelpUrl(configService.getValue(ConfigKeyEnum.goodsDetailFanliRateHelpUrl.getKey(), acceptData.getSystem()));
+
+ // 闄勫姞淇℃伅
+ OtherInfo otherInfo = new OtherInfo();
+ RewardCouponVO rewardCoupon = new RewardCouponVO();
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", acceptData.getSystem()));
+ JSONObject params1 = new JSONObject();
+ if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
+ params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
+ 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()), acceptData.getSystem()))
+ 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), acceptData.getSystem()));
+ }
+
+ // TODO 鍥炬枃璇︽儏
+ extraVO.setDetailUrl("");
+
+ if (uid != null) {
+ // 鏄惁鍔犲叆鏀惰棌
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id + "",
+ Constant.SOURCE_TYPE_DY);
+ extraVO.setCollected(collectionGoods != null ? true : false);
+ // 鏄惁鍔犲叆閫夊搧搴�
+ extraVO.setStorage(userGoodsStorageService.isExistStorage(uid, id + "", Constant.SOURCE_TYPE_DY));
+ }
+
+ extraVO.setIsNative(true);
+
+ // 鍒嗕韩璺緞
+ String h5Url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(acceptData.getSystem()),
+ 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.getValue(ConfigKeyEnum.noRebateHelpLink.getKey(), acceptData.getSystem());
+ }
+
+ ShareVO shareInfoVO = new ShareVO();
+ shareInfoVO.setHelpLink(helpLink);
+ extraVO.setShare(shareInfoVO);
+
+ if (extraVO.getListShareUser() == null) {
+ extraVO.setListShareUser(new ArrayList<>());
+ }
+
+ if (extraVO.getListCouponUser() == null) {
+ extraVO.setListCouponUser(new ArrayList<>());
+ }
+
+ // 浜戝彂鍗曟枃妗堜俊鎭�
+ getCloudInfo(acceptData, uid, 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.addDYScanHistory(uid, acceptData.getDevice(), dyGoodsDetail);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ try {
+ goodsEvaluateService.updateDYGoods(dyGoodsDetail);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+
/**
* // 浜戝彂鍗曟枃妗堜俊鎭�
*
* @param goodsDetail
*/
private void getCloudInfo(AcceptData acceptData, Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
+ if (1 > 0) {
+ return;
+ }
// 浜戝彂鍗曟槸鍚﹀紑鍚�
boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey(), acceptData.getPlatform(), acceptData.getVersion(), acceptData.getSystem());
if (!cloudOpen && uid != null) {
@@ -1468,7 +1681,7 @@
* @param out
*/
@RequestMapping(value = "getRecommendGoods", method = RequestMethod.POST)
- public void getRecommendGoods(AcceptData acceptData, String id, Integer goodsType, PrintWriter out) {
+ public void getRecommendGoods(AcceptData acceptData, String id, Long uid, Integer goodsType, PrintWriter out) {
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
@@ -1481,17 +1694,13 @@
List<JDGoods> list = JDUtil.getRecommendGoodsById(Long.parseLong(id));
if (list == null) {
- list = new ArrayList<JDGoods>();
+ list = new ArrayList<>();
} else if (list.size() > 10) {
list = list.subList(0, 10);
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null, acceptData.getSystem());
- List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
-
- for (JDGoods goods : list) {
- listDetailVO.add(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO));
- }
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null, acceptData.getSystem());
+ List<GoodsDetailVO> listDetailVO = goodsLijinMnager.loadOtherMoneyInfo(acceptData.getSystem(), uid, list, paramsDTO); //new ArrayList<GoodsDetailVO>();
// 鍙栧伓鏁颁釜鏁版嵁
if (listDetailVO.size() % 2 != 0) {
@@ -1527,11 +1736,9 @@
goodsList = goodsList.subList(0, 10);
}
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(),
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(),
null, acceptData.getSystem());
- for (PDDGoodsDetail goods : goodsList) {
- listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));
- }
+ listDetailVO = goodsLijinMnager.loadOtherMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO);
}
}
}
@@ -1573,13 +1780,9 @@
List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();
if (resultList != null) {
if (resultList != null && resultList.size() > 0) {
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(), acceptData.getSystem());
-
- for (SuningGoodsInfo goods : resultList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
- listDetailVO.add(goodsDetailVO);
- }
+ listDetailVO = goodsLijinMnager.loadOtherMoneyInfo(acceptData.getSystem(), uid, resultList, paramsDTO);
}
}
@@ -1590,19 +1793,48 @@
return;
}
- List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(Long.parseLong(id), 10);
- // 鍒濆鍖�
- if (goodsList == null) {
- goodsList = new ArrayList<TaoBaoGoodsBrief>();
+ if (goodsType == Constant.SOURCE_TYPE_DY) {
+ DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(id));
+ //goods.getThird_cid()
+ DYGoodsSearchFilter searchFilter = new DYGoodsSearchFilter();
+ searchFilter.setPageSize(10);
+ searchFilter.setPage(1);
+ searchFilter.setThird_cids(Arrays.asList(new Integer[]{goods.getThird_cid()}));
+ ListResult listResult = CSJCPSApiUtil.searchGoods(searchFilter);
+
+
+
+ List<GoodsDetailVO> listDetailVO = new ArrayList<>();
+ if (listResult != null) {
+ if (listResult.getDataList() != null && listResult.getDataList() .size() > 0) {
+ List<DYGoods> dyGoodsList=new ArrayList<>();
+ for(Object o:listResult.getDataList()){
+ dyGoodsList.add((DYGoods)o);
+ }
+
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(), acceptData.getSystem());
+ listDetailVO = goodsLijinMnager.loadOtherMoneyInfo(acceptData.getSystem(), uid, dyGoodsList, paramsDTO);
+ }
+ }
+
+ 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<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>();
- ConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null, acceptData.getSystem());
- goodsList.parallelStream().forEach(goods -> {
- if (goods != null) {
- listExtra.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
- }
- });
+ List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 10);
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<>();
+ }
+
+ List<GoodsDetailVO> listExtra = new ArrayList<>();
+ GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null, acceptData.getSystem());
+
+ listExtra = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO, false);
List<GoodsDetailVO> listQuality = new ArrayList<GoodsDetailVO>();
// 鍙栧伓鏁颁釜鏁版嵁
@@ -1645,28 +1877,56 @@
}
String jumpLink = null;
String materialId = "https://item.jd.com/" + id + ".html";
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.coupon);
if (StringUtil.isNullOrEmpty(couponUrl)) {
JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, JDApiUtil.POSITION_COUPON + "",
- "");
- if (jumpLink == null) {
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, JDApiUtil.POSITION_COUPON + "",
+
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid,
"");
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponUrl), e);
+ }
+ if (jumpLink == null) {
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, pid,
+ "");
+ } catch (Exception e) {
+ e.printStackTrace();
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s ", materialId), e);
+ }
}
} else {
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, JDApiUtil.POSITION_COUPON + "",
- "");
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid,
+ "");
+ } catch (Exception e) {
+ e.printStackTrace();
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponUrl), e);
+ }
if (StringUtil.isNullOrEmpty(jumpLink)) {
jumpLink = couponUrl;
}
}
- JSONObject data = new JSONObject();
- data.put("native", true);
- data.put("jumpLink", jumpLink);
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getJDJumpInfo(jumpLink);
+ vo.set_native(true);
+ vo.setJumpLink(jumpLink);
+ vo.setNativeJumpLink(jumpLink);
+ try {
+ String wxPage = "pages/union/proxy/proxy?spreadUrl=" + URLEncoder.encode(jumpLink, "UTF-8");
+ WXXCXJumpInfoVO wxxcxJumpInfoVO = new WXXCXJumpInfoVO();
+ wxxcxJumpInfoVO.setUserName("gh_45b306365c3d");
+ wxxcxJumpInfoVO.setPath(wxPage);
+ vo.setWxxcxJumpInfo(wxxcxJumpInfoVO);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
out.print(JsonUtil.loadTrueResult(data));
}
@@ -1693,6 +1953,11 @@
getJDLinkWithoutFanLi(acceptData, id, couponUrl, source, out);
return;
}
+ //鏈櫥褰曢鍒�
+ if (uid == null) {
+ getJDLinkWithoutFanLi(acceptData, id, couponUrl, source, out);
+ return;
+ }
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
@@ -1706,6 +1971,11 @@
return;
}
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
+ return;
+ }
+
JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(id);
if (goods == null) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
@@ -1714,28 +1984,45 @@
String jumpLink = null;
String materialId = "https://item.jd.com/" + id + ".html";
+
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.fanli);
+
if (StringUtil.isNullOrEmpty(couponUrl)) {
JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, JDApiUtil.POSITION_FANLI + "",
- uid + "");
- if (jumpLink == null) {
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, JDApiUtil.POSITION_FANLI + "",
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid,
uid + "");
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponUrl), e);
+ }
+ if (jumpLink == null) {
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, null, null, pid,
+ uid + "");
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s", materialId), e);
+ }
}
} else {
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, JDApiUtil.POSITION_FANLI + "",
- uid + "");
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pid,
+ uid + "");
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponUrl), e);
+ }
if (StringUtil.isNullOrEmpty(jumpLink)) {
jumpLink = couponUrl;
}
}
- JSONObject data = new JSONObject();
- data.put("native", true);
- data.put("jumpLink", jumpLink);
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getJDJumpInfo(jumpLink);
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ if (uid != null)
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
@@ -1756,7 +2043,11 @@
String jumpLink = null;
String materialId = "https://item.jd.com/" + id + ".html";
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, JDApiUtil.POSITION_FANLI + "", null);
+ try {
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.fanli), null);
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s couponUrl-%s", materialId, couponUrl), e);
+ }
if (StringUtil.isNullOrEmpty(jumpLink)) {
jumpLink = couponUrl;
}
@@ -1784,21 +2075,32 @@
return;
}
- String pid = PinDuoDuoApiUtil.PID_FANLI;
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.fanli);
//鍙槸棰嗗埜
if (!SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.fanli)) {
- pid = PinDuoDuoApiUtil.PID_COUPON;
+ pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.coupon);
uid = null;
} else {
- if (uid == null || uid <= 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;
+ if (uid == null) {
+ pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.coupon);
+ uid = null;
+ } else {
+ if (uid == null || uid <= 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;
+ }
+
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
+ return;
+ }
}
}
@@ -1810,15 +2112,22 @@
return;
}
- //TODO 鏄惁闇�瑕佽繑鍥炵粦瀹氶摼鎺�
- String customParams = pddAuthService.getFanliCustomParams(uid);
+ String customParams = uid == null ? Constant.PDD_SEARCH_CUSTOMER_PARAMS : pddAuthService.getFanliCustomParams(uid);
boolean auth = PinDuoDuoApiUtil.isAuth(pid, customParams);
- PDDPromotionUrl convertUrl = PinDuoDuoApiUtil.convert(id, pid + "", customParams, !auth);
JSONObject data = new JSONObject();
- data.put("native", true);
- data.put("jumpLink", convertUrl.getUrl());
- data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
- LogHelper.test(String.format("鎷煎澶氳浆閾�:uid:%s data:%s", uid + "", data.toString()));
+ PDDConvertLinkResultVO convertUrl = null;
+ if (!auth) {
+ convertUrl = PinDuoDuoApiUtil.getAuthLink(pid, customParams);
+ } else {
+ convertUrl = PinDuoDuoApiUtil.convert(goods.getGoodsSign(), pid + "", customParams, !auth);
+ LogHelper.test(String.format("鎷煎澶氳浆閾�:uid:%s data:%s", uid + "", data.toString()));
+ }
+
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getPDDJumpInfo(convertUrl);
+ data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ if (uid != null)
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
@@ -1826,7 +2135,7 @@
}
/**
- * 鎷煎澶氳喘涔伴摼鎺�
+ * 鍞搧浼氳喘涔伴摼鎺�
*
* @param acceptData
* @param uid
@@ -1846,18 +2155,28 @@
if (!SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.fanli)) {
tag = VipShopUtil.getCouponChanTag();
} else {
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
- return;
- }
+ //鍙槸棰嗗埜
+ if (uid == null) {
+ tag = VipShopUtil.getCouponChanTag();
+ } else {
+ if (uid == null || uid <= 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;
- }
+ 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;
+ }
- tag = VipShopUtil.getBuyChanTag(uid);
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
+ return;
+ }
+
+ tag = VipShopUtil.getBuyChanTag(uid);
+ }
}
VIPGoodsInfo goods = VipShopApiUtil.getGoodsDetail(id + "");
@@ -1867,12 +2186,13 @@
}
VIPConvertResultDTO convertUrl = VipShopApiUtil.convertLink(id + "", tag);
- JSONObject data = new JSONObject();
- data.put("native", true);
- data.put("jumpLink", convertUrl.getUrl());
- data.put("nativeJumpLink", convertUrl.getDeeplinkUrl());
- out.print(JsonUtil.loadTrueResult(data));
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getVIPShopJumpInfo(convertUrl);
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ if (uid != null)
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
+ out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
}
@@ -1884,19 +2204,29 @@
return;
}
- String pid = SuningApiUtil.PID_BUY;
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_SUNING, SystemPIDInfo.PidType.fanli);
if (!SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.fanli)) {
- pid = SuningApiUtil.PID_COUPON;
+ pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_SUNING, SystemPIDInfo.PidType.coupon);
uid = null;
} else {
- if (uid == null || uid <= 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;
+ if (uid == null) {
+ pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_SUNING, SystemPIDInfo.PidType.coupon);
+ uid = null;
+ } else {
+ if (uid == null || uid <= 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;
+ }
+
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
+ return;
+ }
}
}
@@ -1914,12 +2244,76 @@
String quanUrl = null;
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl()))
quanUrl = goods.getCouponInfo().getCouponUrl();
- String link = SuningApiUtil.convertLink(SuningUtil.getProductUrl(supplierCode, goodsCode), quanUrl,
+ SuningConvertLinkResult link = SuningApiUtil.convertLinkNew(goodsCode, supplierCode,
pid, uid + "");
- JSONObject data = new JSONObject();
- data.put("native", false);
- data.put("jumpLink", link);
+
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getSuningJumpInfo(link);
+
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ if (uid != null)
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
+
+
+ // 鑾峰緱閲戝竵
+ integralGetService.addCouponRebate(uid);
+ }
+
+
+ @RequestMapping(value = "getDYLink")
+ public void getDYLink(AcceptData acceptData, Long uid, String id, String source, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(id)) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧ID涓嶈兘涓虹┖"));
+ return;
+ }
+
+ if (!SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.fanli)) {
+ uid = null;
+ } else {
+ if (uid == null) {
+ uid = null;
+ } else {
+ if (uid == null || uid <= 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;
+ }
+
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
+ return;
+ }
+ }
+ }
+
+
+ DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(id));
+ if (goods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ DYConvertResult link = null;
+ try {
+ link = CSJCPSApiUtil.goodsConvert(goods.getDetail_url(), DYUtil.createFanLiExtraInfo(uid),
+ "");
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧杞摼澶辫触"));
+ }
+
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getDYJumpInfo(link);
+
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ if (uid != null)
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
+ out.print(JsonUtil.loadTrueResult(data));
+
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
@@ -1946,7 +2340,7 @@
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
TaoBaoGoodsBrief goods = null;
try {
- goods = TaoKeApiUtil.getSimpleGoodsInfo(Long.parseLong(goodsId));
+ goods = TaoKeApiUtil.getSimpleGoodsInfo(goodsId);
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
@@ -2010,7 +2404,7 @@
for (int i = 0; i < array.size(); i++) {
JSONObject obj = array.optJSONObject(i);
CommonGoods cg = new CommonGoods();
- cg.setGoodsId(obj.optLong("goodsId"));
+ cg.setGoodsId(obj.optString("goodsId"));
cg.setGoodsType(obj.optInt("goodsType"));
commonGoodsList.add(cg);
}
@@ -2021,7 +2415,7 @@
}
// 鍒嗙鍚勪釜骞冲彴鐨勫晢鍝佷俊鎭�
- List<Long> tbGoodsList = new ArrayList<>();
+ List<String> tbGoodsList = new ArrayList<>();
List<Long> jdGoodsList = new ArrayList<>();
List<Long> pddGoodsList = new ArrayList<>();
@@ -2032,15 +2426,15 @@
if (cg.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
tbGoodsList.add(cg.getGoodsId());
} else if (cg.getGoodsType() == Constant.SOURCE_TYPE_JD) {
- jdGoodsList.add(cg.getGoodsId());
+ jdGoodsList.add(Long.parseLong(cg.getGoodsId()));
} else if (cg.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
- pddGoodsList.add(cg.getGoodsId());
+ pddGoodsList.add(Long.parseLong(cg.getGoodsId()));
}
}
Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
- ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(acceptData.getSystem()),
+ GoodsMoneyConfigParamsDTO params = new GoodsMoneyConfigParamsDTO(hongBaoManageService.getFanLiRate(acceptData.getSystem()),
hongBaoManageService.getShareRate(acceptData.getSystem()), new BigDecimal(80),
hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, acceptData.getSystem()));
@@ -2103,11 +2497,51 @@
return;
}
- link = JDApiUtil.convertLinkWithSubUnionId(link, null, null, JDApiUtil.POSITION_FANLI + "", uid + "");
+ try {
+ link = JDApiUtil.convertLinkWithSubUnionId(link, null, null, pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.fanli), uid + "");
+ } catch (Exception e) {
+ logger.warn(String.format("浜笢杞摼鍑洪敊锛歮aterialId-%s", link), e);
+ }
- JSONObject data = new JSONObject();
- data.put("link", link);
+
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getJDJumpInfo(link);
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+ @RequestMapping(value = "convertPDDLink")
+ public void convertPDDLink(AcceptData acceptData, String resourceType, String channelType, Long uid, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(resourceType) && StringUtil.isNullOrEmpty(channelType)) {
+ out.print(JsonUtil.loadFalseResult(1, "resourceType|channelType涓虹┖"));
+ return;
+ }
+ String customParams = null;
+ if (uid != null)
+ customParams = pddAuthService.getFanliCustomParams(uid);
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.fanli);
+ PDDConvertLinkResultVO pddConvertLinkResultVO = null;
+ if (!StringUtil.isNullOrEmpty(resourceType)) {
+ pddConvertLinkResultVO = PinDuoDuoApiUtil.convertActivity(resourceType, null, pid, customParams);
+ } else if (!StringUtil.isNullOrEmpty(channelType)) {
+ pddConvertLinkResultVO = PinDuoDuoApiUtil.convertChannel(channelType, pid, customParams);
+ }
+
+
+ GoodsJumpLinkVO vo = GoodsJumpUtil.getPDDJumpInfo(pddConvertLinkResultVO);
+ JSONObject data = JSONObject.fromObject(new Gson().toJson(vo));
+ data.put("native", vo.is_native());
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+ @RequestMapping(value = "getTaoBaoGoodsDetailImgs")
+ public void getTaoBaoGoodsDetailImgs(AcceptData acceptData, String id, PrintWriter out) {
+ TaoBaoGoodsImportantInfo info = DaTaoKeApiUtil.getGoodsImportantInfo(id);
+ if (info == null || info.getDetailImages() == null) {
+ out.print(JsonUtil.loadFalseResult(""));
+ return;
+ }
+ out.print(JsonUtil.loadTrueResult(new Gson().toJson(info.getDetailImages())));
+ }
+
}
--
Gitblit v1.8.0