From 24df43fb3f2e136d3d768abf89f098c290c2bab8 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 03 三月 2020 15:19:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 9132dca..47cef12 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -417,7 +417,7 @@
if (addComment) {
String commentText = "";
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, null);
+ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, "0");
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
commentText = template.replace("[鍙ｄ护]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsType == Constant.SOURCE_TYPE_JD) {
@@ -1280,7 +1280,15 @@
for (CommentInfo commentInfo: comments) {
String typeCoupon = commentInfo.getType();
if (StringUtil.isNullOrEmpty(typeCoupon)) {
- commentInfo.setType(commentInfo.getTypeEnum().getDesc());
+ if (commentInfo.getTypeEnum() == null) {
+ commentInfo.setType("");
+ } else {
+ commentInfo.setType(commentInfo.getTypeEnum().getDesc());
+ }
+ } else if (typeCoupon.equals(CommentInfoEnum.goodsCoupon.name())) {
+ commentInfo.setType("鍟嗗搧浼樻儬鍒�");
+ } else if (typeCoupon.equals(CommentInfoEnum.currencyCoupon.name())) {
+ commentInfo.setType("閫氱敤浼樻儬鍒�");
}
String coupon = commentInfo.getCoupon();
--
Gitblit v1.8.0