From 09417e97672be66c5e312b10f23a9e30da3acb97 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期一, 24 二月 2020 15:23:08 +0800
Subject: [PATCH] 热销转换发圈
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 261 ----------------------------------------------------
1 files changed, 0 insertions(+), 261 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 ac930c1..a4a67f0 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,7 +2,6 @@
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;
@@ -27,7 +26,6 @@
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialLabel;
@@ -40,10 +38,8 @@
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
-import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
-import com.yeshi.fanli.entity.dynamic.SimpleGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -70,7 +66,6 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.vo.dynamic.ArticleVO;
-import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -596,8 +591,6 @@
int type = 1;
if (cid == TYPE_FAQUAN){
type = 1;
- oldDynamicInfo(acceptData, page, subId, out); // 鑰佺増鍔ㄦ��
- return;
} else if (cid == TYPE_SUCAI) {
type = 2;
}
@@ -702,14 +695,6 @@
@RequestMapping(value = "evaluateShare", method = RequestMethod.POST)
public void evaluateShare(AcceptData acceptData, Long uid, String id, Integer type, Long goodsId, Integer goodsType,
PrintWriter out) {
-
- // 鑰佺増鍔ㄦ��
- if (1 > 0) {
- oldDynamicShare(acceptData, uid, id, type, goodsId, goodsType, out);
- return;
- }
-
-
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -944,251 +929,5 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
- public void oldDynamicInfo(AcceptData acceptData, Integer page, String subId, PrintWriter out) {
- long cid = 1;
- Long sid = null;
- if (!StringUtil.isNullOrEmpty(subId)){
- sid = Long.parseLong(subId);
- }
- List<DynamicInfo> listd = dynamicInfoService.queryV2(2, 74, (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE,
- cid, sid);
- if (listd == null) {
- listd = new ArrayList<DynamicInfo>();
- }
-
- List<GoodsEvaluate> list = new ArrayList<>();
- for (DynamicInfo info : listd) {
- GoodsEvaluate goodsEvaluate = new GoodsEvaluate();
- goodsEvaluate.setId(info.getId());
- ActivityUser user = info.getUser();
- goodsEvaluate.setUser(user);
- List<ClientTextStyleVO> titles = info.getTitle();
- if (titles != null) {
- goodsEvaluate.setTitle(info.getTitle().get(0).getContent());
- } else {
- goodsEvaluate.setTitle("");
- }
- goodsEvaluate.setShareNum(info.getShareCount());
- goodsEvaluate.setPublishTime(info.getCreateTime());
- goodsEvaluate.setLineNum(2);
- List<GoodsPicture> imgs = info.getImgs();
-
- int i = 0;
- GoodsDetailVO goods= null;
- List<ImgInfo> imgList = new ArrayList<>();
- for (GoodsPicture goodsPicture : imgs) {
- ImgInfo imgInfo = new ImgInfo();
- imgInfo.setH(1);
- imgInfo.setW(1);
- imgInfo.setLarge(false);
- imgInfo.setUrl(goodsPicture.getUrl());
- imgInfo.setUrlHD(goodsPicture.getUrl());
-
- GoodsDetailVO goodsVO = goodsPicture.getGoodsVO();
- if (goodsVO == null) {
- imgInfo.setType(ImgEnum.img);
- } else {
- imgInfo.setType(ImgEnum.goods);
- SimpleGoods simpleGoods = new SimpleGoods();
- simpleGoods.setGoodsId(goodsVO.getGoodsId());
- simpleGoods.setGoodsType(goodsVO.getGoodsType());
-
- CouponInfoVO couponInfo = goodsVO.getCouponInfo();
- if (couponInfo == null) {
- simpleGoods.setState(0);
- simpleGoods.setPrice(goodsVO.getZkPrice());
- } else {
- simpleGoods.setState(goodsVO.getState());
- simpleGoods.setPrice(goodsVO.getCouponPrice());
- simpleGoods.setAmount(couponInfo.getAmount());
- }
- imgInfo.setGoods(simpleGoods);
- goods = goodsVO;
- i++;
- }
- imgList.add(imgInfo);
- }
-
- goodsEvaluate.setImgList(imgList);
- if (i == 1) {
- goodsEvaluate.setGoods(goods);
- }
- list.add(goodsEvaluate);
- }
-
- GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
- gsonBuilder.registerTypeAdapter(CommentInfoEnum.class, new JsonSerializer<CommentInfoEnum>() {
- @Override
- public JsonElement serialize(CommentInfoEnum value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive(1);
- } else {
- return new JsonPrimitive(value.getDesc());
- }
- }
- }).registerTypeAdapter(ImgEnum.class, new JsonSerializer<ImgEnum>() {
- @Override
- public JsonElement serialize(ImgEnum value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- return new JsonPrimitive(value.getVlaue());
- }
- }
- }).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
- @Override
- public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
- String desc = "";
- if (value != null) {
- // 鍒ゆ柇鏄惁鏄悓涓�澶�
-
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(value);
- int y1 = calendar.get(Calendar.YEAR);// 鑾峰彇骞翠唤
- int d1 = calendar.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
-
- Date nowDate = new Date();
- Calendar calendar2 = Calendar.getInstance();
- calendar2.setTime(nowDate);
- int y2 = calendar2.get(Calendar.YEAR);// 鑾峰彇骞翠唤
- int d2 = calendar2.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
-
- long old = value.getTime();
- long now = nowDate.getTime();
- if (y1 == y2) {
- if (d1 == d2) {
- long cha = now - old;
- if (cha < 1000 * 60 * 2L) {
- desc = "鍒氬垰";
- } else if (cha < 1000 * 60 * 60L) {
- desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
- } else {
- desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
- }
- } else if (d2 - d1 == 1) {
- desc = "鏄ㄥぉ";
- } else {
- desc = (d2 - d1) + "澶╁墠";
- }
- } else {
- int timeDistance = 0;
- for (int i = y1; i < y2; i++) {
- if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) {
- timeDistance += 366; // 闂板勾
- } else {
- timeDistance += 365; // 涓嶆槸闂板勾
- }
- }
- desc = timeDistance + (d2 - d1) + "澶╁墠";
- }
-
- return new JsonPrimitive(desc);
- }
-
- return new JsonPrimitive("");
- }
- });
- Gson gson = gsonBuilder.create();
-
- JSONObject data = new JSONObject();
- data.put("list", gson.toJson(list));
- data.put("count", dynamicInfoService.count(cid, sid));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- public void oldDynamicShare(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;
- }
-
- DynamicInfo dynamicInfo = dynamicInfoService.getById(id);
- if (dynamicInfo == 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<GoodsPicture> imgs = dynamicInfo.getImgs();
- if (imgs == null) {
- out.print(JsonUtil.loadFalseResult("璇ュ浘鐗囧唴瀹瑰凡涓嶅瓨鍦�"));
- return;
- }
-
- List<String> list = new ArrayList<>();
- // 鐑攢涓哄崟鍝�
- for (GoodsPicture imgInfo : imgs) {
- GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
- if (goodsVO == null) {
- list.add(imgInfo.getUrl());
- continue;
- }
-
- String jumpLink = getJumpLink(goodsVO, user, inviteCode);
- if (!StringUtil.isNullOrEmpty(jumpLink)) {
- list.add(jumpLink);
- }
- }
-
- Integer shareCount = dynamicInfo.getShareCount();
- if (shareCount == null) {
- shareCount = 0;
- }
-
- if (type == 3) {
- shareCount++;
- dynamicInfoService.updateShareCount(dynamicInfo);
- }
-
- 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));
- }
-
}
--
Gitblit v1.8.0