From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改，爬单新规则添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index baea60b..8919cf3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -18,6 +18,7 @@
import org.yeshi.utils.taobao.TbImgUtil;
import com.fasterxml.jackson.core.util.VersionUtil;
+import com.google.gson.GsonBuilder;
import com.yeshi.fanli.controller.client.v2.ShareControllerV2;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -512,7 +513,8 @@
}
data.put("count", count);
- data.put("result_list", list);
+ data.put("result_list",
+ JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create().toJson(list));
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -1079,15 +1081,32 @@
data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+
+ String inviteCode = null;
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null)
+ inviteCode = extra.getInviteCode();
// 娴嬭瘯
List<String> commentTexts = new ArrayList<>();
- commentTexts.add("鍙ｄ护1");
- commentTexts.add("鍙ｄ护2鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护");
- commentTexts.add("鍙ｄ护3");
- commentTexts.add("鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护鍙ｄ护鍙ｄ护娣樺彛浠ゅ彛浠ゅ彛浠ゆ窐鍙ｄ护");
+ String commentTextStr = configService.get("share_single_goods_comment_text");
+ if (!StringUtil.isNullOrEmpty(commentTextStr)) {
+ JSONArray arr = JSONArray.fromObject(commentTextStr);
+ for (int i = 0; i < arr.size(); i++) {
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ if (arr.optString(i).contains("[閭�璇风爜]")) {
+ continue;
+ }
+ }
+ if (StringUtil.isNullOrEmpty(inviteCode))
+ commentTexts.add(arr.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[娣樺彛浠", data.optString("token")));
+ else
+ commentTexts.add(arr.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK)
+ .replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", data.optString("token")));
+ }
+ }
data.put("commentTexts", commentTexts);
data.put("wxErCode", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken()));
-
}
} else if (cid == 4) { // 閭�璇峰垎浜�
@@ -1112,7 +1131,7 @@
}
}
title = title.replace("銆愰個璇风爜銆�", inviteCode);
- title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid));
+ title = title.replace("銆愰個璇烽摼鎺ャ��", Constant.YINGYONGBAO_LINK);
data.put("title", title);
} else { // 鏈夊浘鍒嗕韩
--
Gitblit v1.8.0