From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 20 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 ec7abe5..b01df9b 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
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -51,6 +52,7 @@
import com.yeshi.fanli.exception.dynamic.ActivityUserException;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityUserService;
@@ -67,6 +69,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -1433,6 +1436,13 @@
@Override
+ public List<GoodsEvaluate> queryValidZeroPoint(int start, int count) {
+ return goodsEvaluateDao.queryValidZeroPoint(start, count);
+ }
+
+
+
+ @Override
public void saveComment(String pid, CommentInfo commentInfo) throws GoodsEvaluateException {
GoodsEvaluate goodsEvaluate = goodsEvaluateDao.getById(pid);
if (goodsEvaluate == null) {
@@ -2009,6 +2019,7 @@
commentInfo.setContent(comment);
commentInfo.setType("");
} else {
+ goodsBrief.setCouponLink(null);
String token = shareGoodsService.createTaoBaoToken(Constant.LINK_TOKEN_VERIFY_UID, goodsBrief);
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
@@ -2066,7 +2077,7 @@
@Override
- public void addGoodsEvaluate2(TaoBaoGoodsBrief goodsBrief, List<String> imgs, ActivityUser user, String title, String comment) throws GoodsEvaluateException {
+ public int addGoodsEvaluate(TaoBaoGoodsBrief goodsBrief, List<String> imgs, ActivityUser user, String title) throws GoodsEvaluateException {
if (goodsBrief == null || user == null || StringUtil.isNullOrEmpty(title)) {
throw new GoodsEvaluateException(1, "鐩稿叧鍙傛暟涓嶈兘涓虹┖");
}
@@ -2122,27 +2133,33 @@
i++;
}
+
+ // 鐢熸垚鍙ｄ护
+ String token = null;
+ try {
+ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(Constant.LINK_TOKEN_VERIFY_UID, goodsBrief.getAuctionId(), "1");
+ token = taoBaoLink.getTaoToken();
+ } catch (ShareGoodsException e) {
+ e.printStackTrace();
+ throw new GoodsEvaluateException(1, "杞摼澶辫触");
+ }
+
+
+ String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
+ String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
+ if (!goodsVO.isHasCoupon()) {
+ commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
+ commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+ 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);
commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon);
- if (!StringUtil.isNullOrEmpty(comment)) {
- commentInfo.setContent(comment);
- commentInfo.setType("");
- } else {
- String token = shareGoodsService.createTaoBaoToken(Constant.LINK_TOKEN_VERIFY_UID, goodsBrief);
- String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
- String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
- if (!goodsVO.isHasCoupon()) {
- commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
- commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
- 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());
- }
+ commentInfo.setContent(commentText);
+ commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc());
List<CommentInfo> commentsNew = new ArrayList<>();
commentsNew.add(commentInfo);
@@ -2160,19 +2177,48 @@
lineNum = 3;
}
}
-
+
+ int result = 0;
+ int zeroPoint = 0;
+ // 鈽呮繁澶滃ぇ绂忓埄锛氬厛鎶㈠埜锛�0鐐瑰噯鏃朵笅鍗曗槄
+ // 鍚繖绉嶆枃鏈殑瀹氫簬姣忔櫄10鐐瑰湪鍔ㄦ��-鍙戝湀 闆嗕腑鍙戯紝姣忔櫄10鐐瑰湪缇ゅ彂鍗曚腑鍙彂涓�鏉°��
+ Date startTime = new Date();
+ if (!StringUtil.isNullOrEmpty(title)) {
+ String value = configService.get(ConfigKeyEnum.evaluateZeroKey.getKey());
+ if (!StringUtil.isNullOrEmpty(value)) {
+ List<String> asList = Arrays.asList(value.split(","));
+ if (asList != null && asList.size() > 0) {
+ boolean zero = false;
+ for (String zerokey: asList) {
+ if(title.contains(zerokey)) {
+ zero = true;
+ break;
+ }
+ }
+
+ if (zero) {
+ result = 1;
+ zeroPoint = 1;
+ startTime = TimeUtil.parseYYYYMMDD_HHMM(TimeUtil.getGernalTime(startTime) + " 22:00");
+ }
+ }
+ }
+ }
+
+
GoodsEvaluate goodsEvaluate = new GoodsEvaluate();
goodsEvaluate.setId(UUID.randomUUID().toString().replace("-", ""));
goodsEvaluate.setUser(user);
goodsEvaluate.setTitle(getDescNew(title));
goodsEvaluate.setState(1);
+ goodsEvaluate.setZeroPoint(zeroPoint);
goodsEvaluate.setDynamicType(1);
goodsEvaluate.setType(EvaluateEnum.single);
goodsEvaluate.setShareNum((int) (Math.random() * 5000) + 1000);
goodsEvaluate.setShareNumReal(0);
goodsEvaluate.setWeight(0.0);
- goodsEvaluate.setStartTime(new Date());
- goodsEvaluate.setEndTime(DateUtil.plusDayDate(3, new Date()));
+ goodsEvaluate.setStartTime(startTime);
+ goodsEvaluate.setEndTime(DateUtil.plusDayDate(3, startTime));
goodsEvaluate.setPublishTime(new Date());
goodsEvaluate.setCreateTime(new Date());
goodsEvaluate.setUpdateTime(new Date());
@@ -2181,6 +2227,10 @@
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setComments(commentsNew);
goodsEvaluateDao.save(goodsEvaluate);
+
+ return result;
+
+
}
@Override
--
Gitblit v1.8.0