From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index 6aabcbc..d264993 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -106,7 +106,7 @@
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@@ -259,6 +259,13 @@
commentText = commentText.replace("[鍒稿悗浠穄", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
}
+ commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+ return commentText;
+ }
+
+ // 娣樺疂鍒嗕韩娲诲姩
+ public static String getTaoBaoActiivtyERCodeContentNew(String template, String token) {
+ String commentText = template.replace("[娣樺彛浠", token);
commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
return commentText;
}
@@ -654,8 +661,9 @@
shareInfo.setRecommendText(deleteBlankLine(recommendText));
// 璁剧疆璇勮鏂囨湰閫夐」
- shareInfo.setCommentTextChoiceList(getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode,
- TaoBaoUtil.getGoodsHongBaoMoney(taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));
+ shareInfo.setCommentTextChoiceList(
+ getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode, TaoBaoUtil.getGoodsHongBaoMoney(
+ taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));
out.print(JsonUtil.loadTrueResult(
JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
@@ -734,8 +742,8 @@
shareInfo.setCommentTexts(new ArrayList<>());
if (needGoods)
- shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,
- orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));
+ shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, orderHongBaoMoneyComputeService
+ .getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));
boolean hasCoupon = false;
if (couponInfo != null) {
@@ -1398,8 +1406,12 @@
JSONArray array = new JSONArray();
JSONObject data = new JSONObject();
+
+ boolean notBackSuVip = false;
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
+ notBackSuVip = true;
- List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);
+ List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId, notBackSuVip);
if (list == null || list.size() == 0) {
data.put("title", "鍒嗕韩鍟嗗搧");
data.put("count", 0);
--
Gitblit v1.8.0