From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 21 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 b1f11ea..c78bd7d 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
@@ -17,6 +17,7 @@
import javax.imageio.ImageIO;
import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
@@ -1517,10 +1518,10 @@
e.printStackTrace();
continue;
}
-
+
// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
-
+
List<CommentInfo> comments = evaluateNew.getComments();
if (comments != null && comments.size() > 0) {
EvaluateEnum typeEnum = evaluateNew.getType();
@@ -1801,11 +1802,15 @@
}
@Override
- public void addGoodsEvaluate(Long goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment)
- throws GoodsEvaluateException {
+ public void addGoodsEvaluate(Long goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment,
+ Date startTime) throws GoodsEvaluateException {
if (goodsId == null || user == null || StringUtil.isNullOrEmpty(title)) {
throw new GoodsEvaluateException(1, "鐩稿叧鍙傛暟涓嶈兘涓虹┖");
}
+
+ List<GoodsEvaluate> evaluateList = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId);
+ if (evaluateList != null && evaluateList.size() > 0)
+ return;
TaoBaoGoodsBrief goodsBrief = null;
try {
@@ -1879,16 +1884,11 @@
String token = shareGoodsService.createTaoBaoToken(Constant.LINK_TOKEN_VERIFY_UID, goodsBrief);
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
- commentText = commentText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice()) + "");
if (!goodsVO.isHasCoupon()) {
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
- } else {
- commentText = commentText.replace("[鍒稿悗浠穄",
- MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice()) + "");
- }
- commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n",
- "\r\n");
+ commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n","\r\n");
+ }
commentInfo.setContent(commentText);
commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc());
}
@@ -1920,7 +1920,9 @@
goodsEvaluate.setShareNum((int) (Math.random() * 5000) + 1000);
goodsEvaluate.setShareNumReal(0);
goodsEvaluate.setWeight(0.0);
- goodsEvaluate.setStartTime(new Date());
+ if (startTime == null)
+ startTime = new Date();
+ goodsEvaluate.setStartTime(startTime);
goodsEvaluate.setEndTime(DateUtil.plusDayDate(3, new Date()));
goodsEvaluate.setPublishTime(new Date());
goodsEvaluate.setCreateTime(new Date());
@@ -2075,18 +2077,11 @@
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
-
- commentText = commentText.replace("[鍘熶环]",
- MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice()) + "");
if (!goodsVO.isHasCoupon()) {
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
- } else {
- commentText = commentText.replace("[鍒稿悗浠穄",
- MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice()) + "");
- }
- commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n")
- .replace("\r\n\r\n", "\r\n");
+ 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.setNeedSpin(true);
@@ -2292,6 +2287,61 @@
goodsEvaluateDao.save(goodsEvaluate);
}
}
+
+
+ @Override
+ public void offlineTaoBaoGoods(Long goodsId) {
+ try {
+ if (goodsId == null) {
+ return;
+ }
+ List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ // 涓嬫灦鍟嗗搧
+ offlineGoods(list, Constant.SOURCE_TYPE_TAOBAO, goodsId);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @CacheEvict(value = "dynamicCache", allEntries = true)
+ private void offlineGoods(List<GoodsEvaluate> list, int goodsType, Long goodsId) {
+
+ for (GoodsEvaluate goodsEvaluate : list) {
+ // 鍟嗗搧涓嬫灦
+ GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
+ goodsDetailVO.setState(1);
+
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ if (imgList == null || imgList.size() == 0) {
+ goodsEvaluate.setUpdateTime(new Date());
+ goodsEvaluateDao.save(goodsEvaluate);
+ continue;
+ }
+
+ for (ImgInfo imgInfo : imgList) {
+ SimpleGoods simpleGoods = imgInfo.getGoods();
+ if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId
+ || goodsType != simpleGoods.getGoodsType()) {
+ continue;
+ }
+ simpleGoods.setState(1);
+ GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
+ goodsVO.setState(1);
+
+ imgInfo.setGoods(simpleGoods);
+ imgInfo.setGoodsVO(goodsVO);
+ }
+
+ goodsEvaluate.setImgList(imgList);
+ goodsEvaluate.setUpdateTime(new Date());
+ goodsEvaluateDao.save(goodsEvaluate);
+ }
+ }
+
private void removeOverdue() {
List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
--
Gitblit v1.8.0