From 58ee87fd64efdb75d16e396c3d952d3522c3a747 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 17:54:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5ab85e0..921095f 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
@@ -143,6 +143,7 @@
if (record.getStartTime() == null)
record.setStartTime(new Date());
+
record.setPublishTime(record.getStartTime());
String id = record.getId();
@@ -427,7 +428,7 @@
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, "0");
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
- commentText = template.replace("[鍙ｄ护]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsType == Constant.SOURCE_TYPE_JD) {
String couponUrl = null;
JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);
@@ -1485,6 +1486,7 @@
paramsDTO);
if (goodsDetailVO != null) {
simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
+ simpleGoods.setState(0);
CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
if (couponInfo == null) {
simpleGoods.setPrice(goodsDetailVO.getZkPrice());
@@ -1586,7 +1588,7 @@
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), null);
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
- String commentText = template.replace("[鍙ｄ护]", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
commentText = commentText.replace("[鍘熶环]", goodsVO.getZkPrice().toString());
if (!goodsVO.isHasCoupon()) {
--
Gitblit v1.8.0