From a1be6075c6b1365a7abc66bf559d6058039248ab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 五月 2021 18:13:29 +0800
Subject: [PATCH] 淘礼金兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 34 ++++++++++++++++++----------------
1 files changed, 18 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 58d17f6..ede84e7 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,19 +16,19 @@
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.exception.taobao.TaoBaoConvertLinkException;
import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.StringUtil;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.core.task.TaskExecutor;
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.QRCodeUtil;
+import org.yeshi.utils.*;
import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -59,7 +59,6 @@
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
-import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -68,11 +67,9 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
-import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.homemodule.CommonShareInfoService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -90,7 +87,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.homemodule.SpecialVO;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.common.vo.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -874,7 +871,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;
@@ -981,7 +978,7 @@
}
if (list.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヤ俊鎭凡涓嬫灦"));
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
return;
}
@@ -1021,10 +1018,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, JDApiUtil.POSITION_SHARE + "",
user.getId() + "");
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
- jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsVO.getGoodsId()),
+ PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsVO.getGoodsId()));
+ if (pddGoodsDetail == null) {
+ return null;
+ }
+
+ jumpLink = PinDuoDuoApiUtil.getPromotionUrl(pddGoodsDetail.getGoodsSign(),
PinDuoDuoApiUtil.PID_SHARE + "", user.getId() + "");
}
@@ -1095,7 +1097,7 @@
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1179,7 +1181,7 @@
String newText = text;
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1374,7 +1376,7 @@
String newText = text;
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -1506,7 +1508,7 @@
if (shareInfo.getNeedSpin() != null && shareInfo.getNeedSpin()) {
try {
String erCodeContent = "";
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(text, uid, true, true);
// 鑾峰彇鍙ｄ护
List<String> tokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(newText);
if (tokenList != null && tokenList.size() > 0) {
@@ -1603,7 +1605,7 @@
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
try {
- newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ newText = convertLinkManager.convertLinkFromText(text, uid, true, true);
} catch (ConvertLinkExceptionException e) {
if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
--
Gitblit v1.8.0