From 534a87e48dfbaff65605995ec2a29211e0a8f45a Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 15 十一月 2019 16:06:51 +0800 Subject: [PATCH] 红包功能改为2.1版本后再放开 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 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 4c40bbc..8c437eb 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 @@ -17,6 +17,7 @@ import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; +import com.fasterxml.jackson.core.util.VersionUtil; import com.yeshi.fanli.controller.client.v2.ShareControllerV2; import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO; import com.yeshi.fanli.entity.accept.AcceptData; @@ -1073,10 +1074,39 @@ } TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); - - data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken())); + if (!com.yeshi.fanli.util.VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), + acceptData.getVersion())) + 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<>(); + 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) { // 閭�璇峰垎浜� -- Gitblit v1.8.0