From 0019bfde4bb8188bc7d8d9ae7878d117c7bd539c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 2763715..af2a432 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -49,7 +49,6 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.count.DailyCountMomentsService;
import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
@@ -136,13 +135,12 @@
@Resource
private ShareGoodsService shareGoodsService;
-
- @Resource
- private DailyCountMomentsService dailyCountMomentsService;
-
+
+ // @Resource
+ // private DailyCountMomentsService dailyCountMomentsService;
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
private final static long TYPE_REXIAO = 1;// 鐑攢
private final static long TYPE_TUIJIAN = 2;// 鎺ㄨ崘
@@ -638,7 +636,7 @@
return new JsonPrimitive("");
} else {
// 淇濈暀2浣嶅皬鏁�
- return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value)+"");
+ return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value) + "");
}
}
}).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -842,7 +840,8 @@
if (imgInfo.getGoodsVO() != null)
if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
&& imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode, imgInfo.getUrl());
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode,
+ imgInfo.getUrl());
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -852,7 +851,8 @@
} else if (type == 2 || type == 3) {
for (ImgInfo imgInfo : imgs) {
if (imgInfo.getGoodsVO() != null) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode, imgInfo.getUrl() );
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode,
+ imgInfo.getUrl());
if (!StringUtil.isNullOrEmpty(jumpLink)) {
list.add(jumpLink);
}
@@ -870,7 +870,7 @@
else if (imgInfo.getType() == ImgEnum.activity)
if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
list.add(imgInfo.getActivityPic());
- }else if(!StringUtil.isNullOrEmpty(imgInfo.getUrl())){
+ } else if (!StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
list.add(imgInfo.getUrl());
}
}
@@ -885,11 +885,12 @@
if (type == 3) {
shareCount++;
goodsEvaluateService.addShareNum(id);
-
+
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- dailyCountMomentsService.addShareClick();
+ // TODO
+ // dailyCountMomentsService.addShareClick();
}
});
}
@@ -909,7 +910,8 @@
}
}
- private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode, String mainPic) {
+ private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode,
+ String mainPic) {
String jumpLink = null;
if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
TaoBaoLink taoBaoLink = null;
@@ -1021,30 +1023,29 @@
return;
}
}
-
-
+
// 鏇挎崲浠锋牸
if (goodsEvaluate.getType() == EvaluateEnum.single) {
GoodsDetailVO goods = goodsEvaluate.getGoods();
- newText = newText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) +"");
+ newText = newText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
if (!goods.isHasCoupon()) {
newText = newText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
newText = newText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
} else {
- newText = newText.replace("[鍒稿悗浠穄", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice())+"");
+ newText = newText.replace("[鍒稿悗浠穄", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice()) + "");
}
newText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
}
-
-
+
JSONObject data = new JSONObject();
data.put("text", newText);
out.print(JsonUtil.loadTrueResult(data));
-
+
executor.execute(new Runnable() {
@Override
public void run() { // 娣诲姞姣忔棩缁熻
- dailyCountMomentsService.addCopyComment();
+ // TODO
+ // dailyCountMomentsService.addCopyComment();
}
});
}
--
Gitblit v1.8.0