fanli-server.git

			@@ -340,7 +340,6 @@
			}
			}


			// 上传文件替换
			if (fileRequest != null) {
			for (int i = 0; i < 9; i++) {
			@@ -476,8 +475,9 @@
			}

			/*
			* // 无券不能自动生成评论 CouponInfoVO couponInfo1 = goodsDetailVO.getCouponInfo(); if
			* (couponInfo1 == null) { addComment = false; }
			* // 无券不能自动生成评论 CouponInfoVO couponInfo1 =
			* goodsDetailVO.getCouponInfo(); if (couponInfo1 == null) { addComment
			* = false; }
			*/

			String commentText = "";
			@@ -509,15 +509,18 @@
			commentText = template.replace("[链接]", jumpLink);
			}

			// commentText = commentText.replace("[原价]", MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getZkPrice())+"");
			// commentText = commentText.replace("[原价]",
			// MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getZkPrice())+"");
			// if (!goodsDetailVO.isHasCoupon()) {
			// commentText = commentText.replace("领券抢购", "抢购");
			// commentText = commentText.replace("【券后价】[券后价]元", "");
			// } else {
			// commentText = commentText.replace("[券后价]", MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getCouponPrice())+"");
			// commentText = commentText.replace("[券后价]",
			// MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getCouponPrice())+"");
			// }
			//
			// commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\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();
			@@ -1482,7 +1485,6 @@
			return goodsEvaluateDao.count(key, state, dynamicType);
			}


			@Override
			public void addRanDomShareCount() {
			// 发圈
			@@ -1519,7 +1521,6 @@
			LogHelper.errorDetailInfo(e);
			}
			}


			@Override
			@Cacheable(value = "dynamicCache", key = "'queryValidEvaluateCache-'+#start")
			@@ -1592,18 +1593,33 @@
			if (goods != null) {
			String content = commentInfoNew.getContent();
			if (!StringUtil.isNullOrEmpty(content)) {
			content = content.replace("[原价]", MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice())+"");
			content = content.replace("[原价]",
			MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
			if (goods.isHasCoupon()) {
			content = content.replace("[券后价]",MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice())+"");
			content = content.replace("[券后价]",
			MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice()) + "");
			} else {
			singleCoupn = false;
			content = content.replace("领券抢购", "抢购");
			content = content.replace("【券后价】[券后价]元", "");
			}
			content = content.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
			// 替换淘宝官方活动
			List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
			for (String st : activityIdList)
			content = content.replace(st, "");

			commentInfoNew.setContent(content);
			}
			}
			}
			if (typeEnum != null && typeEnum == EvaluateEnum.activity) {
			// 替换淘宝官方活动
			String content = commentInfoNew.getContent();
			List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
			for (String st : activityIdList)
			content = content.replace(st, "");
			commentInfoNew.setContent(content);
			}

			CommentInfoEnum typeComment = commentInfoNew.getTypeEnum();
			@@ -1896,7 +1912,9 @@

			TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), "0");

			// TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(Constant.LINK_TOKEN_VERIFY_UID, goodsVO.getGoodsId(), null);
			// TaoBaoLink taoBaoLink =
			// shareGoodsService.getTaoBaoLinkForShare(Constant.LINK_TOKEN_VERIFY_UID,
			// goodsVO.getGoodsId(), null);
			String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
			String commentText = template.replace("[淘口令]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

			@@ -2089,12 +2107,14 @@
			String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
			String commentText = template.replace("[淘口令]", TaoBaoUtil.filterTaoToken(token));

			commentText = commentText.replace("[原价]", MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice())+"");
			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("[券后价]",
			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");
			@@ -2129,7 +2149,6 @@
			commentInfo2.setContent(text2);
			commentInfo2.setTypeEnum(CommentInfoEnum.goodsCoupon);
			commentInfo2.setType("");


			List<CommentInfo> commentsNew = new ArrayList<>();
			commentsNew.add(commentInfo);
			@@ -2252,7 +2271,8 @@
			if (goods == null) {
			return;
			}
			List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goods.getAuctionId());
			List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO,
			goods.getAuctionId());
			if (queryExist == null \|\| queryExist.size() == 0) {
			return;
			}
			@@ -2305,8 +2325,8 @@
			int goodsType = goodsNew.getGoodsType();
			for (GoodsEvaluate goodsEvaluate: listExist) {
			GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
			if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null
			&& goodsDetailVO.getGoodsId() == goodsId && goodsDetailVO.getGoodsType() == goodsType) {
			if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null && goodsDetailVO.getGoodsId() == goodsId
			&& goodsDetailVO.getGoodsType() == goodsType) {
			goodsEvaluate.setGoods(goodsNew);
			}

			@@ -2322,7 +2342,6 @@
			\|\| goodsType != simpleGoods.getGoodsType()) {
			continue;
			}


			simpleGoods.setState(0);
			simpleGoods.setPrice(goodsNew.getCouponPrice());