From 9073dee61a9279c2476305c34f92c96330ba16d3 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 15:38:24 +0800
Subject: [PATCH] 发圈
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 157 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 111 insertions(+), 46 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 4843754..5ab85e0 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
@@ -415,6 +415,13 @@
}
}
+
+ CouponInfoVO couponInfo1 = goodsDetailVO.getCouponInfo();
+ if (couponInfo1 == null) {
+ addComment = false;
+ }
+
+
if (addComment) {
String commentText = "";
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
@@ -745,6 +752,7 @@
throw new GoodsEvaluateException(1, "鎻忚堪璇笉鑳戒负绌�");
}
+
String tagUrl = commentInfo.getTagUrl();
String content = commentInfo.getContent();
if (StringUtil.isNullOrEmpty(tagUrl) && StringUtil.isNullOrEmpty(content) ) {
@@ -759,6 +767,8 @@
} catch (Exception e) {
throw new GoodsEvaluateException(1, "璇峰～鍐欐纭殑鏃堕棿鏍煎紡锛�2020-03-05");
}
+ } else {
+ throw new GoodsEvaluateException(1, "璇峰～鍐欏埜鎴鏃堕棿");
}
if(!StringUtil.isNullOrEmpty(content)) {
@@ -1306,11 +1316,14 @@
if (list == null) {
list = new ArrayList<>();
}
-
+ Date now = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (GoodsEvaluate goodsEvaluate: list) {
List<CommentInfo> comments = goodsEvaluate.getComments();
if (comments != null) {
- Date now = new Date();
+ EvaluateEnum typeEnum = goodsEvaluate.getType();
+ List<CommentInfo> commentNew = new ArrayList<>();
+
for (CommentInfo commentInfo: comments) {
String typeCoupon = commentInfo.getType();
if (StringUtil.isNullOrEmpty(typeCoupon)) {
@@ -1325,31 +1338,60 @@
commentInfo.setType("閫氱敤浼樻儬鍒�");
}
+ CommentInfoEnum typeComment = commentInfo.getTypeEnum();
+ if (typeComment != null && typeComment ==CommentInfoEnum.goodsCoupon) {
+ GoodsDetailVO goods = goodsEvaluate.getGoods();
+ if (goods.isHasCoupon()) {
+ commentNew.add(commentInfo);
+ continue;
+ }
+ }
+
String coupon = commentInfo.getCoupon();
String endTime = commentInfo.getEndTime();
if (!StringUtil.isNullOrEmpty(coupon) && !StringUtil.isNullOrEmpty(endTime)) {
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date endDay = sdf.parse(endTime);
- if (endDay.getTime() <= now.getTime()) {
- continue;
+ if (endDay.getTime() > now.getTime()) {
+ int daysBetween = DateUtil.daysBetween(endDay, now);
+ if (daysBetween > 0) {
+ ClientTextStyleVO styleVO = new ClientTextStyleVO();
+ styleVO.setColor("#E5005C");
+ styleVO.setContent(daysBetween + "澶╁悗杩囨湡");
+ styleVO.setContent(coupon);
+
+ List<ClientTextStyleVO> tagList = commentInfo.getTagList();
+ tagList.add(styleVO);
+
+ commentInfo.setTagList(tagList);
+
+ if (typeEnum != null && typeEnum == EvaluateEnum.single) {
+ //鏂板
+ commentNew.add(commentInfo);
+ }
+ }
}
-
- int daysBetween = DateUtil.daysBetween(endDay, now);
- if (daysBetween <= 0) {
- continue;
- }
-
- ClientTextStyleVO styleVO = new ClientTextStyleVO();
- styleVO.setColor("#E5005C");
- styleVO.setContent(daysBetween + "澶╁悗杩囨湡");
- styleVO.setContent(coupon);
-
- List<ClientTextStyleVO> tagList = commentInfo.getTagList();
- tagList.add(styleVO);
-
- commentInfo.setTagList(tagList);
}
+ }
+ goodsEvaluate.setComments(commentNew);
+
+ if (typeEnum != null && typeEnum == EvaluateEnum.single) {
+ if (commentNew.size() == 0) {
+ GoodsDetailVO goods = goodsEvaluate.getGoods();
+ if (goods != null) {
+ goods.setState(1); // 璇勮涓嶅瓨鍦� 涓嬫灦
+ }
+
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ if (imgList != null) {
+ for (ImgInfo imgInfo: imgList) {
+ SimpleGoods simpleGoods = imgInfo.getGoods();
+ if (simpleGoods != null) {
+ simpleGoods.setState(1);
+ }
+ }
+
+ }
+ }
}
}
}
@@ -1375,6 +1417,8 @@
}
try {
+ Date now = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
BigDecimal vipFanLiRate = hongBaoManageService.getVIPFanLiRate();
@@ -1394,12 +1438,33 @@
}
}
+ EvaluateEnum type = goodsEvaluate.getType();
+ if (type != null && type == EvaluateEnum.activity) {
+ List<CommentInfo> comments = goodsEvaluate.getComments();
+ if (comments != null) {
+ for (CommentInfo commentInfo: comments) {
+ CommentInfoEnum commentInfoEnum = commentInfo.getTypeEnum();
+ if (commentInfoEnum != null && commentInfoEnum== CommentInfoEnum.currencyCoupon) {
+ String endTime = commentInfo.getEndTime();
+ if (!StringUtil.isNullOrEmpty(endTime)) {
+ Date endDay = sdf.parse(endTime);
+ if (endDay.getTime() < now.getTime()) {
+ goodsEvaluate.setState(1); // 娲诲姩杩囨湡
+ }
+ }
+ }
+
+ }
+ }
+ }
+
GoodsDetailVO goods = goodsEvaluate.getGoods();
if (goods != null) {
GoodsDetailVO goodsNew = getGoodsNewInfo(goods.getGoodsId(), goods.getGoodsType(), paramsDTO);
if (goodsNew != null) {
goodsEvaluate.setGoods(goodsNew);
} else {
+ goodsEvaluate.setState(0); // 宸插晢鍝佷笅鏋�
goods.setState(1);
goodsEvaluate.setGoods(goods);
}
@@ -1483,7 +1548,7 @@
goodsEvaluate.setUpdateTime(new Date());
goodsEvaluate.setWeight(0.0);
goodsEvaluate.setStartTime(new Date());
- goodsEvaluate.setEndTime(DateUtil.plusYears(new Date(), 100));
+ goodsEvaluate.setEndTime(DateUtil.plusDayDate(3,new Date()));
List<ClientTextStyleVO> titles = info.getTitle();
if (titles != null) {
@@ -1518,34 +1583,34 @@
} else {
simpleGoods.setPrice(goodsVO.getCouponPrice());
simpleGoods.setAmount(couponInfo.getAmount());
+
+ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), null);
+ String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
+ String commentText = template.replace("[鍙ｄ护]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+
+ commentText = commentText.replace("[鍘熶环]", goodsVO.getZkPrice().toString());
+ if (!goodsVO.isHasCoupon()) {
+ commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
+ commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+ } else {
+ commentText = commentText.replace("[鍒稿悗浠穄", goodsVO.getCouponPrice().toString());
+ }
+ commentText =commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+
+
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
+ commentInfo.setContent(commentText);
+ commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
+ commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc());
+
+ List<CommentInfo> commentsNew = new ArrayList<>();
+ commentsNew.add(commentInfo);
+ goodsEvaluate.setComments(commentsNew);
}
imgInfo.setGoods(simpleGoods);
goodsEvaluate.setGoods(goodsVO);
-
- TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), null);
- String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
- String commentText = template.replace("[鍙ｄ护]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
-
- commentText = commentText.replace("[鍘熶环]", goodsVO.getZkPrice().toString());
- if (!goodsVO.isHasCoupon()) {
- commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
- commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
- } else {
- commentText = commentText.replace("[鍒稿悗浠穄", goodsVO.getCouponPrice().toString());
- }
- commentText =commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
-
-
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
- commentInfo.setContent(commentText);
- commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
- commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc());
-
- List<CommentInfo> commentsNew = new ArrayList<>();
- commentsNew.add(commentInfo);
- goodsEvaluate.setComments(commentsNew);
}
imgList.add(imgInfo);
}
--
Gitblit v1.8.0