From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 212 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 131 insertions(+), 81 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 5590389..9c8c9d9 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
@@ -34,8 +34,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.fanli.exception.ShareGoodsException;
import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
@@ -46,17 +46,17 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -131,13 +131,12 @@
@Resource
private BusinessEmergent110Service businessEmergent110Service;
-
+
@Resource
private ConfigTaoLiJinService configTaoLiJinService;
@Resource
private UserTaoLiJinRecordService userTaoLiJinRecordService;
-
// 鑾峰彇鍟嗗搧鍒嗕韩閾炬帴
@RequestMapping(value = "getGoodsShareUrl")
@@ -158,7 +157,7 @@
@RequestMapping(value = "gettaobaosharelink")
public void getTaobaoShareLink(AcceptData acceptData, Long uid, Long auctionId, String source, Integer totalNum,
HttpServletRequest request, PrintWriter out) {
-
+
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
@@ -180,36 +179,39 @@
if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null
&& extraInfo.getRelationValid() == true)
relationId = extraInfo.getRelationId();
-
+
+ if (StringUtil.isNullOrEmpty(relationId)) {
+ out.print(JsonUtil.loadFalseResult(3, "娣樺疂鏈巿鏉冿紝璇峰墠寰�\"鎴戠殑\"缁戝畾娣樺疂璐﹀彿"));
+ return;
+ }
+
if (source != null && "taolijin".equals(source)) {
createTaoLijin(uid, auctionId, totalNum, relationId, request, out);
return;
}
-
+
try {
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);
-
+
JSONObject data = new JSONObject();
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
auctionId + "");
-
+
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
data.put("clickUrl", url);
- data.put("token", taoBaoLink.getTaoToken());
- data.put("rule",
- "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ data.put("token",TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ data.put("rule", configService.get("share_single_goods_rule"));
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
String shareText = "";
// 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "娣樺疂浠�" : "澶╃尗浠�";
+ 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))
@@ -221,17 +223,17 @@
String text = shareGoodsTextTemplateService.geteCouponTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
text = configService.get("goods_share_text_coupon");
-
+
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
.replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
.replace("{浼樻儬鍒搁潰棰潁",
MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
.replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
}
-
+
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
- .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", taoBaoLink.getTaoToken());
+ .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
data.put("shareText", shareText);
String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
if (descText.startsWith("\\r\\n"))
@@ -251,7 +253,7 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, false);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -273,7 +275,7 @@
history.setHongbao(shareMoney);
history.setCreateTime(new Date());
history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);
- history.setTkCode(taobaoLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));
history.setLink(taobaoLink.getClickUrl());
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(taobaoLink.getGoods().getAuctionId());
@@ -289,7 +291,7 @@
});
return;
} catch (ShareGoodsException e) {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:"+uid+"auctionId:"+auctionId, "");
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, "");
// 鍒嗕韩鍑洪敊鎶ヨ
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊"));
@@ -299,10 +301,10 @@
businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
}
}
-
-
+
/**
* 娣樼ぜ閲戝垱寤哄垎浜�
+ *
* @param uid
* @param auctionId
* @param totalNum
@@ -310,25 +312,26 @@
* @param request
* @param out
*/
- public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request, PrintWriter out) {
+ public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request,
+ PrintWriter out) {
try {
TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId);
-
+
TaoBaoGoodsBrief goods = taoBaoLink.getGoods();
-
+
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
-
+
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
out.print(JsonUtil.loadFalseResult(1, "璇ュ晢鍝佹窐绀奸噾涓嶈冻"));
return;
}
-
+
JSONObject data = new JSONObject();
data.put("spreadMoney", " 楼" + spreadMoney.toString());
-
+
String taoLiJinLink = null;
Long tljId = null;
try {
@@ -341,17 +344,16 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
return;
}
-
+
String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
- auctionId + "",AESUtil.encrypt(tljId + "", Constant.UIDAESKEY));
+ auctionId + "", AESUtil.encrypt(tljId + "", Constant.UIDAESKEY));
String shortLink = HttpUtil.getShortLink(url);
if (!StringUtil.isNullOrEmpty(shortLink)) {
url = shortLink;
}
data.put("clickUrl", url);
-
-
+
// 鍒涘缓娣樺彛浠�
if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 閫氳繃绔嬪嵆鎺ㄥ箍鏂瑰紡鑾峰彇娣樺彛浠ゆ垚鍔�
String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);
@@ -359,20 +361,22 @@
taoBaoLink.setTaoToken(quanToken);
}
} else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {
- String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl());
+ String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),
+ taoBaoLink.getClickUrl());
if (!StringUtil.isNullOrEmpty(quanToken)) {
taoBaoLink.setTaoToken(quanToken);
}
}
- data.put("token", taoBaoLink.getTaoToken());
-
- data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");
+ 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");
data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));
// 鏃犲埜
- String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "娣樺疂浠�" : "澶╃尗浠�";
+ 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))
@@ -383,8 +387,8 @@
{
String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(text))
- text = configTaoLiJinService.getValueByKey("goods_share_text");
-
+ text = configTaoLiJinService.getValueByKey("goods_share_text",new Date());
+
shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle())
.replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "")
.replace("{浼樻儬鍒搁潰棰潁",
@@ -392,16 +396,16 @@
.replace("{娣樼ぜ閲戦潰棰潁", MoneyBigDecimalUtil.getWithNoZera(spreadMoney).toString())
.replace("{浼樻儬鍒镐环}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + "");
}
-
+
shareText = shareText.replace("{搴楅摵绫诲瀷}", shopType)
.replace("{鏈堥攢閲弣", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))
- .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", taoBaoLink.getTaoToken());
+ .replace("{棰嗗埜鐭摼}", shortLink).replace("{娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
data.put("shareText", shareText);
String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();
if (descText.startsWith("\\r\\n"))
descText = descText.substring(0);
data.put("descText", descText);
-
+
String imgs = configService.get("goods_share_notify_imgs");
JSONArray array = JSONArray.fromObject(imgs);
int p = (int) (array.size() * Math.random());
@@ -415,7 +419,7 @@
data.put("shareMoney", "楼" + shareMoney.toString());
try {
- ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO, true);
data.put("shareId", shareRecord.getRedisKey());
} catch (Exception e) {
try {
@@ -437,7 +441,7 @@
history.setHongbao(shareMoney);
history.setCreateTime(new Date());
history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);
- history.setTkCode(taobaoLink.getTaoToken());
+ history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));
history.setLink(taobaoLink.getClickUrl());
history.setQuanLink(taobaoLink.getCouponLink());
history.setGoodsId(taobaoLink.getGoods().getAuctionId());
@@ -453,7 +457,7 @@
});
return;
} catch (ShareGoodsException e) {
- LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:"+uid+"auctionId:"+auctionId, "");
+ LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, "");
// 鍒嗕韩鍑洪敊鎶ヨ
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊"));
@@ -463,10 +467,6 @@
businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
}
}
-
-
-
-
/**
* 鍒嗕韩璁板綍缁熻鍒楄〃
@@ -607,6 +607,7 @@
public void updateRecord(AcceptData acceptData, String shareId, String type, PrintWriter out) {
if (StringUtil.isNullOrEmpty(shareId)) {
out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
+ return;
}
// 鏇存柊鍒嗕韩鐢熸晥
@@ -614,13 +615,9 @@
@Override
public void run() {
try {
- userShareGoodsRecordService.takeEffectShareRecord(shareId);
+ userShareGoodsRecordService.takeEffectShareRecord(acceptData, shareId);
} catch (UserShareGoodsRecordException eu) {
- try {
- LogHelper.errorDetailInfo(eu);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -644,7 +641,7 @@
* @param out
*/
@RequestMapping(value = "viewShareTextTemplate", method = RequestMethod.POST)
- public void preViewShareTextTemplate(AcceptData acceptData, Long uid, String template, Long goodsId, Long tljId,
+ public void preViewShareTextTemplate(AcceptData acceptData, Long uid, String template, Long goodsId, Long tljId,
Boolean hasCoupon, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -668,7 +665,7 @@
out.print(JsonUtil.loadFalseResult(4, "鍟嗗搧宸蹭笅鏋�"));
return;
}
-
+
if (StringUtil.isNullOrEmpty(template))
template = getShareTemplate(uid, hasCoupon, tljId);
@@ -713,10 +710,9 @@
Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),
goods.getAuctionId() + "");
}
-
+
String shortLink = HttpUtil.getShortLink(url);
-
-
+
// 鏌ヨ鏄惁鏈夊垎浜�
UserShareGoodsHistory userShareHistory = shareGoodsService.getShareGoodsHistory(uid, goods.getAuctionId());
String token = "";
@@ -811,7 +807,7 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (hasCoupon) {
if (tljId != null) {
shareGoodsTextTemplateService.resetTaoLijinTemplate(uid);
@@ -835,7 +831,7 @@
if (tljId != null) {
String template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
- template = configTaoLiJinService.getValueByKey("goods_share_text");
+ template = configTaoLiJinService.getValueByKey("goods_share_text",new Date());
return template;
} else {
String template = shareGoodsTextTemplateService.geteCouponTemplate(uid);
@@ -843,8 +839,7 @@
template = configService.get("goods_share_text_coupon");
return template;
}
-
-
+
} else {
String template = shareGoodsTextTemplateService.getCommonTemplate(uid);
if (StringUtil.isNullOrEmpty(template))
@@ -867,12 +862,12 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (hasCoupon == null) {
out.print(JsonUtil.loadFalseResult(1, "鏄惁鏈夊埜瀛楁涓虹┖"));
return;
}
-
+
JSONObject data = new JSONObject();
data.put("template", getShareTemplate(uid, hasCoupon, tljId));
out.print(JsonUtil.loadTrueResult(data));
@@ -887,7 +882,7 @@
@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")));
+ out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules",new Date())));
} else {
out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules")));
}
@@ -928,18 +923,74 @@
if (cid == 1 || cid == 2) { // 1 鐑攢鍗曞搧 2 鎺ㄨ崘濂借揣
if (cid == 1) {
List<GoodsPicture> imgs = dynamicInfo.getImgs();
+ if (imgs == null || imgs.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
+ return;
+ }
+
GoodsPicture goodsPicture = imgs.get(0);
if (goodsPicture.getGoodState() == 1) {
out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
return;
- } else {
+ }
+
+ 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 {
+ List<GoodsPicture> imgs = dynamicInfo.getImgs();
+ if (imgs == null || imgs.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("鎵�鏈夊晢鍝佸凡鎶㈠厜"));
+ return;
+ }
+
+ int count = 0;
+ for (GoodsPicture goodsPicture: imgs) {
+ if (goodsPicture.getGoodState() == 1) {
+ count ++;
+ continue;
+ }
+
TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
- try {
- TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId());
- } catch (TaobaoGoodsDownException e) {
- out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
- return;
+ if (goods == null) {
+ count ++;
+ continue;
}
+
+ if (goods.getState() != null && goods.getState() == 1) {
+ count ++;
+ continue;
+ }
+
+ if (!goods.isCoupon()) {
+ count ++;
+ continue;
+ }
+ }
+
+ if (count >= imgs.size()) {
+ out.print(JsonUtil.loadFalseResult("鎵�鏈夊晢鍝佸凡鎶㈠厜"));
+ return;
}
}
@@ -952,13 +1003,12 @@
title += textStyleVO.getContent();
}
}
-
-
- if(StringUtil.isNullOrEmpty(title)) {
+
+ if (StringUtil.isNullOrEmpty(title)) {
title = "缁欎綘鎺ㄨ崘绮鹃�夊ソ鐗╀紭鎯犲埜锛岃喘鐗╁墠鍏堥鍒革紝鍒敊杩囦紭鎯犲摝~";
}
data.put("title", title);
- data.put("content", "鎴戝湪杩斿埄鍒稿彂鐜颁簡涓�涓緢濂界殑鍟嗗搧锛屽揩鏉ョ湅鐪媬");
+ data.put("content",String.format("鎴戝湪%s鍙戠幇浜嗕竴涓緢濂界殑鍟嗗搧锛屽揩鏉ョ湅鐪媬",Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
// 鍒嗕韩濂栭噾
ClientTextStyleVO desc = dynamicInfo.getDesc();
@@ -1015,7 +1065,7 @@
relationId = extraInfo.getRelationId();
}
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId);
- data.put("token", taoBaoLink.getTaoToken());
+ data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
}
} else if (cid == 4) { // 閭�璇峰垎浜�
--
Gitblit v1.8.0