From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 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 6c73c7c..64913fc 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
@@ -21,6 +21,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
@@ -31,6 +32,7 @@
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.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.ShareGoodsTextTemplate;
import com.yeshi.fanli.entity.jd.JDGoods;
@@ -66,6 +68,7 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
@@ -208,6 +211,21 @@
}
}
+ public static String getERCodeContent(TaoBaoGoodsBrief goods, String token) {
+ String content = String.format("銆�%s銆�%s鍏�", goods.getUserType() == 1 ? "T鐚环" : "T瀹濅环",
+ MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
+ content += "\n\r";
+
+ if (!StringUtil.isNullOrEmpty(goods.getCouponInfo())) {
+ content += String.format("銆愬埜鍚庝环銆�%s鍏�", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
+ content += "\n\r";
+ }
+ content += "------------";
+ content += "\n\r";
+ content += "寰╁埗杩欐潯" + token + "锛岄�插叆Tao瀹濆嵆鍙喘涔�";
+ return content;
+ }
+
/**
* 鍒涘缓娣樺疂鍒嗕韩淇℃伅
*
@@ -221,8 +239,12 @@
*/
public void createTaoBaoShare(AcceptData acceptData, Long uid, Long goodsId, Integer totalNum, String source,
HttpServletRequest request, PrintWriter out) {
-
UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ UserInfoExtra userExtraInfo = userInfoExtraService.getUserInfoExtra(uid);
+ String inviteCode=null;
+ if(userExtraInfo!=null)
+ inviteCode=userExtraInfo.getInviteCode();
+
String relationId = null;
if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null
&& extraInfo.getRelationValid() == true)
@@ -241,6 +263,12 @@
try {
ShareInfoVO shareInfo = new ShareInfoVO();
+
+
+
+ // 娴嬭瘯
+
+
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);
@@ -257,6 +285,27 @@
shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
shareInfo.setRule(configService.get("share_single_goods_rule"));
shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
+
+ String commentTextStr= configService.get("share_single_goods_comment_text");
+ List<String> commentTexts = new ArrayList<>();
+ if(!StringUtil.isNullOrEmpty(commentTextStr))
+ {
+ JSONArray array= JSONArray.fromObject(commentTextStr);
+ for(int i=0;i<array.size();i++)
+ {
+ if(StringUtil.isNullOrEmpty(inviteCode))
+ {
+ if(array.optString(i).contains("[閭�璇风爜]"))
+ {
+ continue;
+ }
+ }
+ commentTexts.add(array.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK).replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", shareInfo.getToken()));
+ }
+ }
+ shareInfo.setCommentTexts(commentTexts);
+
+
String shareText = "";
// 鏃犲埜
@@ -293,6 +342,12 @@
descText = descText.substring(0);
}
shareInfo.setDescText(descText);
+ // 娴嬭瘯
+ // 2.0.2涔嬪墠
+ if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
+ shareInfo.setClickUrl(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
+
+ shareInfo.setWxErCode(getERCodeContent(taoBaoLink.getGoods(), shareInfo.getToken()));
// 鎻愮ず鍥炬枃鍐呭
String imgs = configService.get("goods_share_notify_imgs");
@@ -551,7 +606,7 @@
public void createJDShare(AcceptData acceptData, Long uid, Long goodsId, String source, PrintWriter out) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
if (jdGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佹窐宸蹭笅鏋�"));
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佸凡涓嬫灦"));
return;
}
@@ -571,8 +626,10 @@
ShareInfoVO shareInfo = new ShareInfoVO();
shareInfo.setClickUrl(jumpLink);
+ shareInfo.setWxErCode(jumpLink);
shareInfo.setRule(configService.get("share_rule_link_jd"));
shareInfo.setPictUrl(jdGoods.getPicUrl());
+ shareInfo.setCommentTexts(new ArrayList<>());
String shareText = "";
boolean hasCoupon = false;
@@ -681,6 +738,8 @@
ShareInfoVO shareInfo = new ShareInfoVO();
shareInfo.setClickUrl(jumpLink);
+ shareInfo.setWxErCode(jumpLink);
+ shareInfo.setCommentTexts(new ArrayList<>());
shareInfo.setRule(configService.get("share_rule_link_pdd"));
shareInfo.setPictUrl(goods.getGoodsImageUrl());
@@ -1331,6 +1390,8 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -1369,7 +1430,7 @@
dataObject.put("totalOrder", goodsGroup.getTotalOrder());
dataObject.put("totalMoney", "楼" + goodsGroup.getTotalMoney());
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
detailVO.setId(commonGoods.getId());
dataObject.put("goods", gson.toJson(detailVO));
array.add(dataObject);
--
Gitblit v1.8.0