From e75b0d79535a6bcd147cca4a54632b70b42afdb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 18:10:18 +0800
Subject: [PATCH] 特价完善
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index fa8f530..4c28d5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -16,9 +16,12 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.StringUtil;
@@ -142,16 +145,15 @@
private ConvertLinkManager convertLinkManager;
@Resource
- private ShareGoodsService shareGoodsService;
-
- @Resource
private DailyCountMomentsService dailyCountMomentsService;
@Resource
private CommonShareInfoService commonShareInfoService;
+
+
@Resource
- private UserCloudService userCloudService;
+ private PIDManager pidManager;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -623,7 +625,7 @@
} else if (cid == TYPE_SUCAI) {
type = 2;
}
- List<GoodsEvaluate> listNew = new ArrayList<GoodsEvaluate>();
+ List<GoodsEvaluate> listNew = new ArrayList<>();
List<GoodsEvaluate> list = goodsEvaluateService.queryMaterialsCache((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE, type, acceptData.getSystem());
@@ -870,7 +872,7 @@
}
String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
if (SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.threeSale)) {
- inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
if (StringUtil.isNullOrEmpty(inviteCode)) {
out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜鏈縺娲�"));
return;
@@ -977,7 +979,7 @@
}
if (list.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヤ俊鎭凡涓嬫灦"));
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
return;
}
@@ -997,7 +999,7 @@
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
TaoBaoLink taoBaoLink = null;
try {
- taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(user.getId(), Long.parseLong(goodsVO.getGoodsId()),
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(system,user.getId(), Long.parseLong(goodsVO.getGoodsId()),
relationId, null);
} catch (TaoBaoConvertLinkException e) {
e.printStackTrace();
@@ -1017,11 +1019,15 @@
couponUrl = couponInfo.getLink();
}
String materialId = "https://item.jd.com/" + goodsVO.getGoodsId() + ".html";
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "",
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null, pidManager.getPidCache(system, Constant.SOURCE_TYPE_JD, SystemPIDInfo.PidType.share),
user.getId() + "");
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
- jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsVO.getGoodsId()),
- PinDuoDuoApiUtil.PID_SHARE + "", user.getId() + "");
+ PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsVO.getGoodsId()));
+ if (pddGoodsDetail == null) {
+ return null;
+ }
+
+ jumpLink = PinDuoDuoApiUtil.getPromotionUrl(pddGoodsDetail.getGoodsSign(), pidManager.getPidCache(system, Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.share), user.getId() + "");
}
FileUploadResult uploadResult = qrCodeService.drawDynamicGoodsPoster(jumpLink, user.getPortrait(), inviteCode,
@@ -1091,7 +1097,7 @@
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(acceptData.getSystem(), text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1175,7 +1181,7 @@
String newText = text;
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(acceptData.getSystem(), text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1370,7 +1376,7 @@
String newText = text;
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(acceptData.getSystem(), text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1502,7 +1508,7 @@
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
String erCodeContent = "";
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(acceptData.getSystem(), text, uid, true, true);
// 鑾峰彇鍙ｄ护
List<String> tokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(newText);
if (tokenList != null && tokenList.size() > 0) {
@@ -1599,7 +1605,7 @@
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(acceptData.getSystem(), text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
--
Gitblit v1.8.0