From adffbf437239d7d921f053746d9485e521ec57e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:05:37 +0800
Subject: [PATCH] 导师微信调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 383 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 227 insertions(+), 156 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 50f0893..7daa906 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
@@ -2,6 +2,7 @@
import java.io.PrintWriter;
import java.lang.reflect.Type;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -11,6 +12,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -40,12 +42,13 @@
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
+import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
import com.yeshi.fanli.exception.share.ShareGoodsException;
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;
@@ -60,6 +63,7 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
@@ -128,6 +132,15 @@
@Resource
private ConvertLinkManager convertLinkManager;
+
+ @Resource
+ private ShareGoodsService shareGoodsService;
+
+ @Resource
+ private DailyCountMomentsService dailyCountMomentsService;
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
private final static long TYPE_REXIAO = 1;// 鐑攢
private final static long TYPE_TUIJIAN = 2;// 鎺ㄨ崘
@@ -242,9 +255,8 @@
// 2.0.7杩斿洖鍙戝湀+娲诲姩+瀛﹂櫌+绱犳潗
list.add(map.get(TYPE_FAQUAN));
list.add(map.get(TYPE_HUODONG));
-// list.add(map.get(TYPE_XUEYUAN));
- list.add(map.get(TYPE_SUCAI));
-
+ list.add(map.get(TYPE_XUEYUAN));
+ // list.add(map.get(TYPE_SUCAI));
} else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
// 2.0.6杩斿洖鐑攢+娲诲姩+鎺ㄨ崘+瀛﹂櫌+閭�璇�
list.add(map.get(TYPE_REXIAO));
@@ -359,12 +371,7 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
- if (special.getStartTime() != null && special.getEndTime() != null)
- special.setTimeTask(true);
- else
- special.setTimeTask(false);
-
- if (special.isTimeTask()) {
+ if (special.getStartTime() != null && special.getEndTime() != null) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
} else// 璁剧疆鍊掕鏃�
@@ -595,7 +602,7 @@
try {
int type = 1;
- if (cid == TYPE_FAQUAN){
+ if (cid == TYPE_FAQUAN) {
type = 1;
} else if (cid == TYPE_SUCAI) {
type = 2;
@@ -606,7 +613,7 @@
if (list == null) {
list = new ArrayList<>();
}
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
gsonBuilder.registerTypeAdapter(ImgEnum.class, new JsonSerializer<ImgEnum>() {
@Override
@@ -615,6 +622,16 @@
return new JsonPrimitive("");
} else {
return new JsonPrimitive(value.getVlaue());
+ }
+ }
+ }).registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value) + "");
}
}
}).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -672,27 +689,31 @@
});
Gson gson = gsonBuilder.create();
long count = goodsEvaluateService.countValidMaterials(type);
-
+
JSONArray jsonArray = new JSONArray();
-
+
String listStr = gson.toJson(list);
JSONArray array = JSONArray.fromObject(listStr);
- for (int i = 0; i< array.size() ; i++) {
+ for (int i = 0; i < array.size(); i++) {
Object object = array.get(i);
JSONObject json = JSONObject.fromObject(object);
Object shareNum = json.get("shareNum");
if (shareNum != null) {
int num = Integer.parseInt(shareNum.toString());
- if (num >= 10000) {
+
+ if (num >= 100000000) {
+ double sales = num;
+ String salesCountMidea = String.format("%.1f", sales / 100000000);
+ json.put("shareNum", salesCountMidea + "浜�");
+ } else if (num >= 10000) {
double sales = num;
String salesCountMidea = String.format("%.1f", sales / 10000);
json.put("shareNum", salesCountMidea + "涓�");
- }
+ }
}
jsonArray.add(json);
}
-
-
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", jsonArray);
@@ -702,7 +723,7 @@
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ淇℃伅澶辫触"));
LogHelper.errorDetailInfo(e);
}
-
+
}
/**
@@ -719,115 +740,65 @@
@RequestMapping(value = "evaluateShare", method = RequestMethod.POST)
public void evaluateShare(AcceptData acceptData, Long uid, String id, Integer type, Long goodsId, Integer goodsType,
PrintWriter out) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(id) || type == null) {
- out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
- return;
- }
-
- if (type == 1 && (goodsId == null || goodsType == null)) {
- out.print(JsonUtil.loadFalseResult("鍟嗗搧鍙傛暟涓嶈兘涓虹┖"));
- return;
- }
-
- GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
- if (goodsEvaluate == null) {
- out.print(JsonUtil.loadFalseResult("璇ュ唴瀹瑰凡涓嶅瓨鍦�"));
- return;
- }
-
- UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
- out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
- return;
- }
-
- UserExtraTaoBaoInfo taoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
- String relationId = null;
- if (taoBaoInfo != null && taoBaoInfo.getRelationId() != null && taoBaoInfo.getRelationValid() != null
- && taoBaoInfo.getRelationValid() == true)
- relationId = taoBaoInfo.getRelationId();
-
- if (StringUtil.isNullOrEmpty(relationId)) {
- out.print(JsonUtil.loadFalseResult(2, "娣樺疂鏈巿鏉冿紝璇峰墠寰�\"鎴戠殑\"缁戝畾娣樺疂璐﹀彿"));
- return;
- }
-
- String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
- if (StringUtil.isNullOrEmpty(inviteCode)) {
- out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜鏈縺娲�"));
- return;
- }
-
- List<ImgInfo> imgs = goodsEvaluate.getImgList();
- if (imgs == null) {
- out.print(JsonUtil.loadFalseResult("璇ュ浘鐗囧唴瀹瑰凡涓嶅瓨鍦�"));
- return;
- }
-
- List<String> list = new ArrayList<>();
- Integer dynamicType = goodsEvaluate.getDynamicType();
- if (dynamicType == null || dynamicType.intValue() == 2) {
- for (ImgInfo imgInfo : imgs) {
- if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
- continue;
- if (imgInfo.getType() == ImgEnum.img)
- list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
- else if (imgInfo.getType() == ImgEnum.activity)
- if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
- list.add(imgInfo.getActivityPic());
- }
+ try {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
}
- } else {
- // 鍗曞搧
- if (goodsEvaluate.getType() == EvaluateEnum.single) {
- for (ImgInfo imgInfo : imgs) {
- GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
- if (goodsVO == null) {
- list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
- continue;
- }
- String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- }
+ if (StringUtil.isNullOrEmpty(id) || type == null) {
+ out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
+ return;
+ }
- } else if (goodsEvaluate.getType() == EvaluateEnum.multiple) {
- if (type == 1) {
- for (ImgInfo imgInfo : imgs) {
- if (imgInfo.getGoodsVO() != null)
- if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
- && imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- break;
- }
- }
- } else if (type == 2 || type == 3) {
- for (ImgInfo imgInfo : imgs) {
- if (imgInfo.getGoodsVO() != null) {
- String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- }
- }
- }
+ if (type == 1 && (goodsId == null || goodsType == null)) {
+ out.print(JsonUtil.loadFalseResult("鍟嗗搧鍙傛暟涓嶈兘涓虹┖"));
+ return;
+ }
- } else if (goodsEvaluate.getType() == EvaluateEnum.activity) {
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+ if (goodsEvaluate == null) {
+ out.print(JsonUtil.loadFalseResult("璇ュ唴瀹瑰凡涓嶅瓨鍦�"));
+ return;
+ }
+
+ UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+ if (user == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
+ UserExtraTaoBaoInfo taoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ String relationId = null;
+ if (taoBaoInfo != null && taoBaoInfo.getRelationId() != null && taoBaoInfo.getRelationValid() != null
+ && taoBaoInfo.getRelationValid() == true)
+ relationId = taoBaoInfo.getRelationId();
+
+ if (StringUtil.isNullOrEmpty(relationId)) {
+ out.print(JsonUtil.loadFalseResult(2, "娣樺疂鏈巿鏉冿紝璇峰墠寰�\"鎴戠殑\"缁戝畾娣樺疂璐﹀彿"));
+ return;
+ }
+
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ out.print(JsonUtil.loadFalseResult(1, "閭�璇风爜鏈縺娲�"));
+ return;
+ }
+
+ List<ImgInfo> imgs = goodsEvaluate.getImgList();
+ if (imgs == null) {
+ out.print(JsonUtil.loadFalseResult("璇ュ浘鐗囧唴瀹瑰凡涓嶅瓨鍦�"));
+ return;
+ }
+
+ List<String> list = new ArrayList<>();
+ Integer dynamicType = goodsEvaluate.getDynamicType();
+ if (dynamicType == null || dynamicType.intValue() == 2) {
for (ImgInfo imgInfo : imgs) {
if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
continue;
@@ -838,34 +809,103 @@
list.add(imgInfo.getActivityPic());
}
}
+ } else {
+ // 鍗曞搧
+ if (goodsEvaluate.getType() == EvaluateEnum.single) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getType() == ImgEnum.video)
+ continue;
+
+ GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
+ if (goodsVO == null) {
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl()
+ : imgInfo.getUrlHD());
+ continue;
+ }
+
+ String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode, imgInfo.getUrl());
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ }
+
+ } else if (goodsEvaluate.getType() == EvaluateEnum.multiple) {
+ if (type == 1) {
+ for (ImgInfo imgInfo : imgs) {
+ 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());
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ break;
+ }
+ }
+ } else if (type == 2 || type == 3) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getGoodsVO() != null) {
+ String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, relationId, inviteCode,
+ imgInfo.getUrl());
+ if (!StringUtil.isNullOrEmpty(jumpLink)) {
+ list.add(jumpLink);
+ }
+ }
+ }
+ }
+
+ } else if (goodsEvaluate.getType() == EvaluateEnum.activity) {
+ for (ImgInfo imgInfo : imgs) {
+ if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
+ continue;
+ if (imgInfo.getType() == ImgEnum.img)
+ list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl()
+ : imgInfo.getUrlHD());
+ else if (imgInfo.getType() == ImgEnum.activity)
+ if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
+ list.add(imgInfo.getActivityPic());
+ } else if (!StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
+ list.add(imgInfo.getUrl());
+ }
+ }
+ }
}
- }
- Integer shareCount = goodsEvaluate.getShareNum();
- if (shareCount == null) {
- shareCount = 0;
- }
+ Integer shareCount = goodsEvaluate.getShareNum();
+ if (shareCount == null) {
+ shareCount = 0;
+ }
- if (type == 3) {
- shareCount++;
- goodsEvaluateService.addShareNum(id);
- }
+ if (type == 3) {
+ shareCount++;
+ goodsEvaluateService.addShareNum(id);
- if (list.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヤ俊鎭凡涓嬫灦"));
+ executor.execute(new Runnable() {
+ @Override
+ public void run() { // 娣诲姞姣忔棩缁熻
+ dailyCountMomentsService.addShareClick();
+ }
+ });
+ }
+
+ if (list.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ヤ俊鎭凡涓嬫灦"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", shareCount);
+ data.put("list", list);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍥剧敓鎴愬け璐�"));
return;
}
-
- JSONObject data = new JSONObject();
- data.put("count", shareCount);
- data.put("list", list);
- out.print(JsonUtil.loadTrueResult(data));
}
- @Resource
- private ShareGoodsService shareGoodsService;
-
- private String getJumpLink(GoodsDetailVO goodsVO, UserInfo user, String relationId, String inviteCode) {
+ 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;
@@ -874,8 +914,9 @@
} catch (ShareGoodsException e) {
e.printStackTrace();
}
- jumpLink = ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
- taoBaoLink.getGoods(), TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
+ jumpLink = ShareControllerV2.getERCodeContentNew(
+ configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()), taoBaoLink.getGoods(),
+ TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
} else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
if (jdGoods == null) {
@@ -896,14 +937,13 @@
}
FileUploadResult uploadResult = qrCodeService.drawDynamicGoodsPoster(jumpLink, user.getPortrait(), inviteCode,
- goodsVO);
+ mainPic, goodsVO);
if (uploadResult != null) {
return uploadResult.getUrl();
}
return null;
}
-
/**
* 璇勮澶嶅埗
*
@@ -949,26 +989,57 @@
}
String text = "";
+ CommentInfo comment = null;
List<CommentInfo> comments = goodsEvaluate.getComments();
if (comments != null) {
for (CommentInfo commentInfo : comments) {
if (cid.equals(commentInfo.getId())) {
text = commentInfo.getContent();
+ comment = commentInfo;
+ break;
}
}
}
- try {
- text = convertLinkManager.convertLinkFromText(text, uid, true);
- } catch (Exception e) {
- e.printStackTrace();
- out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
- return;
+ String newText = text; // 闈為�氱敤鍒搁渶瑕侀獙璇�
+ if (comment != null && (comment.getNeedSpin() == null || comment.getNeedSpin())) {
+ try {
+ newText = convertLinkManager.convertLinkFromText(text, uid, true);
+ } catch (ConvertLinkExceptionException e) {
+ if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
+ out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
+ return;
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
+ return;
+ }
+ }
+
+ // 鏇挎崲浠锋牸
+ if (goodsEvaluate.getType() == EvaluateEnum.single) {
+ GoodsDetailVO goods = goodsEvaluate.getGoods();
+ 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.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", text);
+ data.put("text", newText);
out.print(JsonUtil.loadTrueResult(data));
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() { // 娣诲姞姣忔棩缁熻
+ dailyCountMomentsService.addCopyComment();
+ }
+ });
}
}
--
Gitblit v1.8.0