From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 178 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 116 insertions(+), 62 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 9c8c9d9..0ce3f20 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
@@ -17,6 +18,13 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.controller.client.v2.ShareControllerV2;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
@@ -25,10 +33,10 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -63,7 +71,6 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -204,25 +211,26 @@
}
data.put("clickUrl", url);
- data.put("token",TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
- data.put("rule", configService.get("share_single_goods_rule"));
+ data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ data.put("rule", configService.get(ConfigKeyEnum.shareSingleGoodsRule.getKey()));
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
String shareText = "";
// 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM;
+ String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO
+ : TaoBaoConstant.SHARE_PRICE_TM;
if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
+ text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}",
MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "");
} else// 鏈夊埜
{
String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_coupon");
+ text = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
.replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
@@ -240,12 +248,12 @@
descText = descText.substring(0);
data.put("descText", descText);
//
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size())
data.put("notifyPicture", array.optString(p));
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal rate = hongBaoManageService.getShareRate();
@@ -253,7 +261,8 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, false);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,
+ Constant.SOURCE_TYPE_TAOBAO, false);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -320,7 +329,7 @@
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
@@ -370,24 +379,25 @@
data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
data.put("rule",
- "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ "http://apph5.banliapp.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
// 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO : TaoBaoConstant.SHARE_PRICE_TM;
+ String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO
+ : TaoBaoConstant.SHARE_PRICE_TM;
String shareText = "";
if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {
String text = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configService.get("goods_share_text_nocoupon");
+ text = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}",
MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "");
} else// 鏈夊埜
{
String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configTaoLiJinService.getValueByKey("goods_share_text",new Date());
+ text = configTaoLiJinService.getValueByKey("goods_share_text", new Date());
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
.replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
@@ -406,12 +416,12 @@
descText = descText.substring(0);
data.put("descText", descText);
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size())
data.put("notifyPicture", array.optString(p));
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));
// 娣诲姞鍒嗕韩璁板綍
BigDecimal rate = hongBaoManageService.getShareRate();
@@ -419,7 +429,8 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, true);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId,
+ Constant.SOURCE_TYPE_TAOBAO, true);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -500,15 +511,28 @@
List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();
long count = userShareGoodsRecordService.countQueryByUid(uid, source);
-
if (count > 0) {
list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);
}
- data.put("count", count);
- data.put("result_list", list);
- out.print(JsonUtil.loadTrueResult(data));
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
+ }
+ }
+ });
+ Gson gson = gsonBuilder.create();
+ data.put("count", count);
+ data.put("result_list", gson.toJson(list));
+ out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
e.printStackTrace();
@@ -617,7 +641,7 @@
try {
userShareGoodsRecordService.takeEffectShareRecord(acceptData, shareId);
} catch (UserShareGoodsRecordException eu) {
-
+
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -831,19 +855,19 @@
if (tljId != null) {
String template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configTaoLiJinService.getValueByKey("goods_share_text",new Date());
+ template = configTaoLiJinService.getValueByKey("goods_share_text", new Date());
return template;
} else {
String template = shareGoodsTextTemplateService.geteCouponTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_coupon");
+ template = configService.get(ConfigKeyEnum.goodsShareTextCoupon.getKey());
return template;
}
} else {
String template = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configService.get("goods_share_text_nocoupon");
+ template = configService.get(ConfigKeyEnum.goodsShareTextNoCoupon.getKey());
return template;
}
}
@@ -882,9 +906,9 @@
@RequestMapping(value = "getShareTextTemplateRules", method = RequestMethod.POST)
public void getShareTextTemplateRules(AcceptData acceptData, Long tljId, PrintWriter out) {
if (tljId != null) {
- out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules",new Date())));
+ out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules", new Date())));
} else {
- out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules")));
+ out.print(JsonUtil.loadTrueResult(configService.get(ConfigKeyEnum.shareGoodsTemplateRules.getKey())));
}
}
@@ -927,67 +951,67 @@
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
+
GoodsPicture goodsPicture = imgs.get(0);
if (goodsPicture.getGoodState() == 1) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
- }
-
+ }
+
TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
if (goods == null) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
+
if (goods.getState() != null && goods.getState() == 1) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
+
if (!goods.isCoupon()) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
+
try {
TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());
} catch (TaobaoGoodsDownException e) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
}
-
- } else {
+
+ } else {
List<GoodsPicture> imgs = dynamicInfo.getImgs();
if (imgs == null || imgs.size() == 0) {
out.print(JsonUtil.loadFalseResult("鎵�鏈夊晢鍝佸凡鎶㈠厜"));
return;
}
-
+
int count = 0;
- for (GoodsPicture goodsPicture: imgs) {
+ for (GoodsPicture goodsPicture : imgs) {
if (goodsPicture.getGoodState() == 1) {
- count ++;
+ count++;
continue;
- }
-
+ }
+
TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
if (goods == null) {
- count ++;
+ count++;
continue;
}
-
+
if (goods.getState() != null && goods.getState() == 1) {
- count ++;
+ count++;
continue;
}
-
+
if (!goods.isCoupon()) {
- count ++;
+ count++;
continue;
}
}
-
+
if (count >= imgs.size()) {
out.print(JsonUtil.loadFalseResult("鎵�鏈夊晢鍝佸凡鎶㈠厜"));
return;
@@ -1008,7 +1032,8 @@
title = "缁欎綘鎺ㄨ崘绮鹃�夊ソ鐗╀紭鎯犲埜锛岃喘鐗╁墠鍏堥鍒革紝鍒敊杩囦紭鎯犲摝~";
}
data.put("title", title);
- data.put("content",String.format("鎴戝湪%s鍙戠幇浜嗕竴涓緢濂界殑鍟嗗搧锛屽揩鏉ョ湅鐪媬",Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
+ data.put("content", String.format("鎴戝湪%s鍙戠幇浜嗕竴涓緢濂界殑鍟嗗搧锛屽揩鏉ョ湅鐪媬",
+ Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
// 鍒嗕韩濂栭噾
ClientTextStyleVO desc = dynamicInfo.getDesc();
@@ -1017,10 +1042,10 @@
data.put("shareMoney", new BigDecimal(content.substring(index + 1, content.length())).toString());
// 鍒嗕韩鎻愰啋
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotify.getKey()));
// 鍒嗕韩鎻愮ず璇�
- String imgs = configService.get("goods_share_notify_imgs");
+ String imgs = configService.get(ConfigKeyEnum.goodsShareNotifyImgs.getKey());
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
if (p < array.size()) {
@@ -1033,7 +1058,7 @@
// 甯姪閾炬帴
data.put("helpLink",
- "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ "http://apph5.banliapp.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
if (cid == 2) { // 2 鎺ㄨ崘濂借揣
ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordDynamic(uid,
@@ -1055,6 +1080,7 @@
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
+
data.put("clickUrl", url);
// 娣樺疂鍙ｄ护
@@ -1065,16 +1091,47 @@
relationId = extraInfo.getRelationId();
}
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);
+ TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
+ if (!com.yeshi.fanli.util.VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(),
+ acceptData.getVersion()))
+ data.put("clickUrl",
+ ShareControllerV2.getERCodeContentNew(
+ configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods,
+ taoBaoLink.getTaoToken()));
+
data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ // 娴嬭瘯
+ List<String> commentTexts = new ArrayList<>();
+ String commentTextStr = configService.get(ConfigKeyEnum.shareSingleGoodsCommentText.getKey());
+ 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.getERCodeContentNew(
+ configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), goods,
+ taoBaoLink.getTaoToken()));
}
} else if (cid == 4) { // 閭�璇峰垎浜�
- String inviteCode = null;
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- inviteCode = userInfoExtra.getInviteCode();
- } else {
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
out.print(JsonUtil.loadFalseResult(9001, "閭�璇风爜鏈縺娲�"));
return;
}
@@ -1090,7 +1147,7 @@
}
}
title = title.replace("銆愰個璇风爜銆�", inviteCode);
- title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid));
+ title = title.replace("銆愰個璇烽摼鎺ャ��", Constant.YINGYONGBAO_LINK);
data.put("title", title);
} else { // 鏈夊浘鍒嗕韩
@@ -1140,12 +1197,9 @@
String valueBr = valueN.replace("\n", "<br><br>");
data.put("inviteRules", valueBr);
- // 閭�璇烽摼鎺�
- String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
- + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
- data.put("inviteLink", shortLink);
+ data.put("inviteLink", Constant.YINGYONGBAO_LINK);
data.put("inviteCode", inviteCode);
- data.put("helpLink", configService.get("invite_help_link"));
+ data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));
}
}
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0