From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 8d9f846..9e367ba 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
@@ -682,6 +682,9 @@
}
for (GoodsEvaluate goodsEvaluate : list) {
+ if (goodsEvaluate.getGoods() != null) {
+ goodsEvaluate.getGoods().setCreatetime(null);
+ }
GoodsEvaluate evaluateNew = new GoodsEvaluate();
try {
PropertyUtils.copyProperties(evaluateNew, goodsEvaluate);
@@ -717,7 +720,7 @@
for (ImgInfo imgInfo : goodsEvaluate.getImgList()) {
- if (acceptData.getSystem() == SystemEnum.yhqjx) {
+ if (acceptData.getSystem() == SystemEnum.yhqjx||acceptData.getSystem() == SystemEnum.hsb) {
imgInfo.setGoods(null);
imgInfo.setGoodsVO(null);
}
@@ -885,7 +888,7 @@
String url = urlList.get(0);
if (JDUtil.isJDLink(url)) {
try {
- url = jdConvertLinkManager.convertShortUrl(url, uid, acceptData.getSystem(), SystemPIDInfo.PidType.fanli);
+ url = jdConvertLinkManager.convertShortUrl(url, uid, acceptData.getSystem(), uid == null ? SystemPIDInfo.PidType.coupon : SystemPIDInfo.PidType.fanli);
} catch (ParamsException e) {
e.printStackTrace();
}
@@ -899,7 +902,7 @@
String customParams = pddAuthService.getFanliCustomParams(uid);
PDDConvertLinkResultVO convertLinkResult = null;
try {
- convertLinkResult = pddConvertLinkManager.convertGoods(Long.parseLong(pddGoodsId), acceptData.getSystem(), customParams, SystemPIDInfo.PidType.fanli);
+ convertLinkResult = pddConvertLinkManager.convertGoods(Long.parseLong(pddGoodsId), acceptData.getSystem(), customParams, uid == null ? SystemPIDInfo.PidType.coupon : SystemPIDInfo.PidType.fanli);
convertLinkJumpVO = new ConvertLinkJumpVO(GoodsJumpUtil.getPDDJumpInfo(convertLinkResult), Constant.SOURCE_TYPE_PDD);
outPrintConvertResult(convertLinkJumpVO, out);
return;
@@ -928,7 +931,7 @@
if (convertResult != null) {
String originUrl = convertResult.getOrigin_url();
long goodsId = convertResult.getNum_iid();
- TaoBaoLink taoBaoLink = tbConvertLinkManager.convertGoods(goodsId, uid, acceptData.getSystem(), SystemPIDInfo.PidType.fanli);
+ TaoBaoLink taoBaoLink = tbConvertLinkManager.convertGoods(goodsId, uid, acceptData.getSystem(), uid == null ? SystemPIDInfo.PidType.coupon : SystemPIDInfo.PidType.fanli);
convertLinkJumpVO = new ConvertLinkJumpVO(GoodsJumpUtil.getTBJumpInfo(taoBaoLink), Constant.SOURCE_TYPE_TAOBAO);
outPrintConvertResult(convertLinkJumpVO, out);
return;
@@ -1261,7 +1264,7 @@
String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
//鐗逛环鍙渶瑕佸鍒舵枃瀛楋紝涓嶉渶瑕佽浆閾�
- if (acceptData.getSystem() == SystemEnum.yhqjx) {
+ if (acceptData.getSystem() == SystemEnum.yhqjx||acceptData.getSystem() == SystemEnum.hsb) {
newText = GoodsTextUtil.decodeAppHtmlText(newText);
//鍙鍒舵枃瀛�
JSONObject data = new JSONObject();
@@ -1427,7 +1430,7 @@
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
jumpDetail = jumpDetailV2Service.getByTypeCache("web", platformCode,
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
JSONObject inner = new JSONObject();
inner.put("url", jumpLink);
params = inner.toString();
--
Gitblit v1.8.0