From 512f368d7d8e71ee72a8f71dd7d2146f4c64f774 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 六月 2021 18:54:58 +0800
Subject: [PATCH] 特价相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 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 ea53970..4a33520 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
@@ -18,10 +18,14 @@
import javax.imageio.ImageIO;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.SystemFunction;
import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException;
import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
+import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.FileUtil;
+import com.yeshi.fanli.util.StringUtil;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -29,8 +33,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.ImageCropUtil;
+import org.yeshi.utils.*;
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.dynamic.GoodsEvaluateDao;
@@ -67,13 +70,6 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.FilePathEnum;
-import com.yeshi.fanli.util.FileUtil;
-import org.yeshi.utils.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -85,6 +81,7 @@
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.common.vo.ClientTextStyleVO;
+import sun.plugin2.util.SystemUtil;
@Service
public class GoodsEvaluateServiceImpl implements GoodsEvaluateService {
@@ -346,6 +343,9 @@
}
}
}
+ if (oldGoodsVO != null) {
+ oldGoodsVO.setCreatetime(null);
+ }
// 瑙嗛閮ㄥ垎
if (fileRequest != null) {
@@ -452,6 +452,8 @@
if (goodsDetailVO == null) {
throw new GoodsEvaluateException(1, "璇ュ晢鍝佷俊鎭笉瀛樺湪");
}
+
+ goodsDetailVO.setCreatetime(null);
List<ImgInfo> tempList = new ArrayList<ImgInfo>();
int totalImg = 0;
@@ -682,6 +684,8 @@
PDDGoodsDetail goodsInfo = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
goodsDetail = GoodsDetailVOFactory.convertPDDGoods(goodsInfo, params);
}
+ if (goodsDetail != null)
+ goodsDetail.setCreatetime(null);
return goodsDetail;
}
@@ -1696,6 +1700,7 @@
if (typeEnum != null && typeEnum == EvaluateEnum.single) {
GoodsDetailVO goods = evaluateNew.getGoods();
+ goods.setCreatetime(null);
if (goods != null) {
String content = commentInfoNew.getContent();
if (!StringUtil.isNullOrEmpty(content)) {
@@ -1715,6 +1720,9 @@
for (String st : activityIdList)
content = content.replace(st, "");
content = content.replace("{relationId}", "");
+ if (system == SystemEnum.yhqjx) {
+ content = content.replace("\n", "<br>");
+ }
commentInfoNew.setContent(content);
}
}
@@ -1733,6 +1741,7 @@
CommentInfoEnum typeComment = commentInfoNew.getTypeEnum();
if (typeComment != null && typeComment == CommentInfoEnum.goodsCoupon) {
GoodsDetailVO goods = evaluateNew.getGoods();
+ goods.setCreatetime(null);
if (goods != null && goods.isHasCoupon()) {
commentNew.add(commentInfoNew);
continue;
@@ -1774,9 +1783,23 @@
evaluateNew.setComments(commentNew);
if (typeEnum != null && typeEnum == EvaluateEnum.single) {
+
+ if (!SystemInfoUtil.hasFunctions(system, SystemFunction.share)) {
+ List<ImgInfo> imgList = evaluateNew.getImgList();
+ if (imgList != null) {
+ for (ImgInfo imgInfo : imgList) {
+ imgInfo.setGoods(null);
+ if (imgInfo.getType() == ImgEnum.goods)
+ imgInfo.setType(ImgEnum.img);
+ }
+ }
+ }
+
+
if (!currencyCoupon && !singleCoupn) { // 鎵�鏈夊埜璇勮涓嬫灦
GoodsDetailVO goods = evaluateNew.getGoods();
if (goods != null) {
+ goods.setCreatetime(null);
goods.setState(1); // 璇勮涓嶅瓨鍦� 涓嬫灦
evaluateNew.setRemarks("璇勮楠岃瘉涓嬫灦");
}
@@ -1788,6 +1811,9 @@
if (simpleGoods != null) {
simpleGoods.setState(1);
simpleGoods.setRemarks("璇勮楠岃瘉涓嬫灦");
+ }
+ if (system == SystemEnum.yhqjx) {
+ imgInfo.setGoods(null);
}
}
@@ -1801,17 +1827,19 @@
List<GoodsEvaluate> listOBJ = list;
// 鏇存柊鍟嗗搧淇℃伅
- executor.execute(new Runnable() {
- @Override
- public void run() {
- updateGoodInfo(listOBJ);
+ executor.execute(new
- // 鍒犻櫎宸茶繃鏈�
- removeOverdue();
+ Runnable() {
+ @Override
+ public void run() {
+ updateGoodInfo(listOBJ);
- removeDownGoods();
- }
- });
+ // 鍒犻櫎宸茶繃鏈�
+ removeOverdue();
+
+ removeDownGoods();
+ }
+ });
return listNew;
}
--
Gitblit v1.8.0