From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 545 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 330 insertions(+), 215 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
index 29d678e..846e223 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -16,15 +17,25 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
+import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
-import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
+import com.yeshi.fanli.entity.dynamic.ListComment;
+import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
+import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
+import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -32,7 +43,10 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.msg.TokenVO;
+import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
import net.sf.json.JSONObject;
@@ -64,6 +78,28 @@
@Resource
private HongBaoManageService hongBaoManageService;
+ private CommonGoods commonGoods;
+
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, String id, PrintWriter out) {
+ try {
+ goodsEvaluateService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (GoodsEvaluateException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
/**
* 淇濆瓨淇℃伅
*
@@ -74,13 +110,14 @@
@RequestMapping(value = "saveHead")
public void saveHead(String callback, GoodsEvaluate evaluate, HttpServletRequest request, PrintWriter out) {
try {
+ String id = null;
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- goodsEvaluateService.saveHead(fileRequest.getFile("portraitFile"), evaluate);
+ id = goodsEvaluateService.saveHead(fileRequest.getFile("portraitFile"), evaluate);
} else {
- goodsEvaluateService.saveHead(null, evaluate);
+ id = goodsEvaluateService.saveHead(null, evaluate);
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(id));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -93,8 +130,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSingleGoods")
@@ -105,50 +141,11 @@
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
- goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum, picUrls, fileRequest);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (GoodsEvaluateException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇濆瓨淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "saveGoodsCoupon")
- public void saveGoodsCoupon(String callback, String pid, String tags, String tagDesc, PrintWriter out) {
- try {
- goodsEvaluateService.saveGoodsCoupon(pid, tags, tagDesc);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (GoodsEvaluateException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇濆瓨淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "saveSingleGoodsCoupon")
- public void saveSingleGoodsCoupon(String callback, String pid, CommentInfo commentInfo, PrintWriter out) {
- try {
- goodsEvaluateService.saveSingleGoodsCoupon(pid, commentInfo);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum,
+ picUrls, fileRequest);
+ JSONObject object = new JSONObject();
+ object.put("comment", commentText);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -157,12 +154,12 @@
}
}
+
/**
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSingleGoodsinfo")
@@ -176,7 +173,8 @@
List<String> list = new ArrayList<String>();
if (!StringUtil.isNullOrEmpty(pid)) {
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
- if (goodsEvaluate != null && goodsEvaluate.getImgList() != null && goodsEvaluate.getImgList().size() > 0) {
+ if (goodsEvaluate != null && goodsEvaluate.getImgList() != null
+ && goodsEvaluate.getImgList().size() > 0) {
List<ImgInfo> imgList = goodsEvaluate.getImgList();
for (ImgInfo imgInfo : imgList) {
ImgEnum type = imgInfo.getType();
@@ -194,14 +192,14 @@
picNum = goodsEvaluate.getMainPicNum();
}
}
-
+
JSONObject data = new JSONObject();
- data.put("goodsId", goodsId);
- data.put("goodsType", goodsType);
- data.put("videoUrl", videoUrl);
- data.put("videoPic", videoPic);
- data.put("picNum", picNum);
- data.put("list", list);
+ data.put("goodsId", goodsId);
+ data.put("goodsType", goodsType);
+ data.put("videoUrl", videoUrl);
+ data.put("videoPic", videoPic);
+ data.put("picNum", picNum);
+ data.put("list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
@@ -209,15 +207,97 @@
}
}
+
+ /**
+ *
+ * @param callback
+ * @param comments
+ * @param out
+ */
+ @RequestMapping(value = "saveGoodsComment")
+ public void saveGoodsComment(String callback, String id, int kind, ListComment comments, PrintWriter out) {
+ try {
+ if (StringUtil.isNullOrEmpty(id)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
+ return;
+ }
+ if (comments == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏂囨湰鍐呭涓虹┖"));
+ return;
+ }
+ goodsEvaluateService.saveGoodsComment(id, kind, comments.getComment());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛"));
+ } catch (GoodsEvaluateException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ *
+ * @param callback
+ * @param comments
+ * @param out
+ */
+ @RequestMapping(value = "getGoodsComment")
+ public void getGoodsComment(String callback, String id, PrintWriter out) {
+ try {
+ if (StringUtil.isNullOrEmpty(id)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
+ return;
+ }
+
+ List<CommentInfo> newList = new ArrayList<>();
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+ if (goodsEvaluate != null) {
+ List<CommentInfo> comments = goodsEvaluate.getComments();
+ if (comments != null && comments.size() > 0) {
+ for (CommentInfo commentInfo : comments) {
+ CommentInfoEnum typeEnum = commentInfo.getTypeEnum();
+ if (typeEnum == CommentInfoEnum.goodsCoupon) {
+ newList.add(commentInfo);
+ }
+ }
+ }
+ }
+ JSONObject data = new JSONObject();
+ data.put("list", newList);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 淇濆瓨淇℃伅
+ *
+ * @param callback
+ * @param pid
+ * @param kind : 1鍗曞搧 2澶氬搧 3娲诲姩
+ * @param out
+ */
+ @RequestMapping(value = "saveCurrencyCoupon")
+ public void saveCurrencyCoupon(String callback, String pid, int kind, CommentInfo commentInfo, PrintWriter out) {
+ try {
+ goodsEvaluateService.saveCurrencyCoupon(pid, kind, commentInfo);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (GoodsEvaluateException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
/**
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getCurrencyCoupon")
@@ -226,11 +306,13 @@
CommentInfo commentInfo = new CommentInfo();
if (!StringUtil.isNullOrEmpty(pid)) {
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
- if (goodsEvaluate != null && goodsEvaluate.getComments() != null && goodsEvaluate.getComments().size() > 0) {
- for (CommentInfo info: goodsEvaluate.getComments()) {
- if (CommentInfoEnum.currencyCoupon == info.getType()) {
- commentInfo = info;
- }
+ if (goodsEvaluate != null && goodsEvaluate.getComments() != null
+ && goodsEvaluate.getComments().size() > 0) {
+ for (CommentInfo info : goodsEvaluate.getComments()) {
+ if (info != null)
+ if (CommentInfoEnum.currencyCoupon == info.getTypeEnum()) {
+ commentInfo = info;
+ }
}
}
}
@@ -241,42 +323,19 @@
}
}
+
- /**
- * 鑾峰彇淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "getSingleGoodsCoupon")
- public void getSingleGoodsCoupon(String callback, String pid, PrintWriter out) {
- try {
- CommentInfo commentInfo = new CommentInfo();
- if (!StringUtil.isNullOrEmpty(pid)) {
- GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
- if (goodsEvaluate != null && goodsEvaluate.getComments() != null && goodsEvaluate.getComments().size() > 0) {
- for (CommentInfo info: goodsEvaluate.getComments()) {
- if (CommentInfoEnum.goodsCoupon == info.getType()) {
- commentInfo = info;
- }
- }
- }
- }
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(commentInfo));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
- e.printStackTrace();
- }
- }
+
+
+
/**
* 淇濆瓨澶氫釜鍟嗗搧
+ *
* @param out
*/
@RequestMapping(value = "saveMultipleGoods")
- public void saveMultipleGoods(String callback, String pid, String videoUrl, String goodsList,
+ public void saveMultipleGoods(String callback, String pid, String videoUrl, String goodsList,
HttpServletRequest request, PrintWriter out) {
try {
MultipartHttpServletRequest fileRequest = null;
@@ -290,10 +349,13 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ LogHelper.test(e);
}
}
+
/**
* 鑾峰彇澶氫釜鍟嗗搧淇℃伅
*
@@ -306,10 +368,11 @@
String videoPic = "";
List<String> list = new ArrayList<String>();
List<String> goodsList = new ArrayList<String>();
-
+
if (!StringUtil.isNullOrEmpty(pid)) {
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
- if (goodsEvaluate != null && goodsEvaluate.getImgList() != null && goodsEvaluate.getImgList().size() > 0) {
+ if (goodsEvaluate != null && goodsEvaluate.getImgList() != null
+ && goodsEvaluate.getImgList().size() > 0) {
List<ImgInfo> imgList = goodsEvaluate.getImgList();
for (ImgInfo imgInfo : imgList) {
ImgEnum type = imgInfo.getType();
@@ -318,41 +381,40 @@
videoUrl = imgInfo.getVideoUrl();
} else if (type == ImgEnum.goods) {
list.add(imgInfo.getUrl());
- goodsList.add(imgInfo.getGoods().getGoodsId() + "-"+ imgInfo.getGoods().getGoodsType());
- }
+ goodsList.add(imgInfo.getGoods().getGoodsId() + "-" + imgInfo.getGoods().getGoodsType());
+ }
}
}
}
-
+
JSONObject data = new JSONObject();
- data.put("list", list);
- data.put("goodsList", goodsList);
- data.put("videoUrl", videoUrl);
- data.put("videoPic", videoPic);
+ data.put("list", list);
+ data.put("goodsList", goodsList);
+ data.put("videoUrl", videoUrl);
+ data.put("videoPic", videoPic);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
e.printStackTrace();
}
}
-
+
/**
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveActivityPic")
- public void saveActivityPic(String callback, String pid, ImgInfo imgInfo,
- HttpServletRequest request, PrintWriter out) {
+ public void saveActivityPic(String callback, String pid, ImgInfo imgInfo, String picUrls, HttpServletRequest request,
+ PrintWriter out) {
try {
MultipartHttpServletRequest fileRequest = null;
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
- goodsEvaluateService.saveActivityPic(pid, imgInfo, fileRequest);
+ goodsEvaluateService.saveActivityPic(pid, imgInfo,picUrls, fileRequest);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -366,8 +428,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getActivityPic")
@@ -375,47 +436,45 @@
try {
String videoPic = "";
String videoUrl = "";
- String activityPic = "";
String activityUrl = "";
+ List<String> list = new ArrayList<String>();
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
if (goodsEvaluate != null && goodsEvaluate.getImgList() != null && goodsEvaluate.getImgList().size() > 0) {
+ activityUrl = goodsEvaluate.getJumpLink();
List<ImgInfo> imgList = goodsEvaluate.getImgList();
for (ImgInfo imgInfo : imgList) {
ImgEnum type = imgInfo.getType();
if (type == ImgEnum.video) {
videoPic = imgInfo.getUrl();
videoUrl = imgInfo.getVideoUrl();
- } else if (type == ImgEnum.activity) {
- activityPic = imgInfo.getUrl();
- activityUrl = imgInfo.getActivityUrl();
+ } else {
+ list.add(imgInfo.getUrl());
}
}
}
JSONObject data = new JSONObject();
- data.put("videoUrl", videoUrl);
- data.put("videoPic", videoPic);
- data.put("activityPic", activityPic);
- data.put("activityUrl", activityUrl);
+ data.put("videoUrl", videoUrl);
+ data.put("videoPic", videoPic);
+ data.put("listPic", list);
+ data.put("activityUrl", activityUrl);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
e.printStackTrace();
}
}
-
-
+
/**
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSuCai")
- public void saveSuCai(String callback, String pid, String videoUrl, String picUrls,
- HttpServletRequest request, PrintWriter out) {
+ public void saveSuCai(String callback, String pid, String videoUrl, String picUrls, HttpServletRequest request,
+ PrintWriter out) {
try {
MultipartHttpServletRequest fileRequest = null;
if (request instanceof MultipartHttpServletRequest) {
@@ -428,10 +487,56 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ LogHelper.test(e);
}
}
-
-
+
+ /**
+ * 鑾峰彇淇℃伅
+ *
+ * @param callback
+ * @param special 0a39676f138c4dcba722e321d43c4284
+ * @param out
+ */
+ @RequestMapping(value = "getSuCaiPic")
+ public void getSuCaiPic(String callback, String pid, PrintWriter out) {
+ try {
+ String videoUrl = "";
+ String videoPic = "";
+ String activityUrl = "";
+ List<String> list = new ArrayList<String>();
+ if (!StringUtil.isNullOrEmpty(pid)) {
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
+ if (goodsEvaluate != null && goodsEvaluate.getImgList() != null
+ && goodsEvaluate.getImgList().size() > 0) {
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ for (ImgInfo imgInfo : imgList) {
+ ImgEnum type = imgInfo.getType();
+ if (type == ImgEnum.video) {
+ videoPic = imgInfo.getUrl();
+ videoUrl = imgInfo.getVideoUrl();
+ } else if (type == ImgEnum.activity) {
+ activityUrl = imgInfo.getActivityPic();
+ } else if (type == ImgEnum.img) {
+ list.add(imgInfo.getUrl());
+ }
+ }
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("activityUrl", activityUrl);
+ data.put("videoUrl", videoUrl);
+ data.put("videoPic", videoPic);
+ data.put("list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
/**
* 淇濆瓨淇℃伅
*
@@ -461,8 +566,6 @@
e.printStackTrace();
}
}
-
-
/**
* 鍒犻櫎鍥剧墖浠ュ強淇℃伅
@@ -505,8 +608,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, String typeEnum, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -515,7 +617,7 @@
}
try {
- List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1);
+ List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1, typeEnum);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -537,7 +639,7 @@
}
}
- long count = goodsEvaluateService.count(key, state, 1);
+ long count = goodsEvaluateService.count(key, state, 1, typeEnum);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -552,7 +654,6 @@
}
}
-
/**
* 鏌ヨ
*
@@ -573,7 +674,7 @@
}
try {
- List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2);
+ List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2, null);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -595,7 +696,7 @@
}
}
- long count = goodsEvaluateService.count(key, state, 2);
+ long count = goodsEvaluateService.count(key, state, 2, null);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -609,6 +710,7 @@
e.printStackTrace();
}
}
+
/**
* 鏍规嵁閾炬帴鏌ヨ鍟嗗搧
*
@@ -619,91 +721,96 @@
@RequestMapping(value = "getGoodsByUrl")
public void getGoodsByUrl(String callback, String link, PrintWriter out) {
try {
- // CommonGoods commonGoods =
- // clipboardAnalysisManager.parseLink(link);
- // if (commonGoods == null) {
- // JsonUtil.printMode(out, callback,
- // JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
- // return;
- // }
- //
+ //CommonGoods commonGoods = clipboardAnalysisManager.parseLink(link);
+ // 鏍规嵁鍙ｄ护閾炬帴鑾峰彇鍟嗗搧
+ getGoods(link);
+
+ CommonGoods commonGoods = getCommonGoods();
+ if (commonGoods == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
+ return;
+ }
GoodsDetailVO goodsDetail = null;
-
-// try {
-// BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-// BigDecimal shareRate = hongBaoManageService.getShareRate();
-// BigDecimal vipFanLiRate = hongBaoManageService.getVIPFanLiRate();
-// ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate,
-// shareRate, Constant.MAX_REWARD_RATE, vipFanLiRate);
-// TaoBaoGoodsBrief goodsBrief =
-// redisManager.getTaoBaoGoodsBrief(596617470742L);
-// goodsDetail = GoodsDetailVOFactory.convertTaoBao(goodsBrief,
-// params);
-// } catch (TaobaoGoodsDownException e) {
-// JsonUtil.printMode(out, callback,
-// JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
-// return;
-// }
-
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ BigDecimal vipFanLiRate = hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP);
+ ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, vipFanLiRate);
- // if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- // try {
- // TaoBaoGoodsBrief goodsBrief =
- // redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
- // goodsDetail = GoodsDetailVOFactory.convertTaoBao(goodsBrief,
- // params);
- // } catch (TaobaoGoodsDownException e) {
- // JsonUtil.printMode(out, callback,
- // JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
- // return;
- // }
- // } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD)
- // {
- // JDGoods goodsInfo =
-// JDApiUtil.queryGoodsDetail(commonGoods.getGoodsId()); // 楂樼骇鎺ュ彛
- // if (goodsInfo == null) {
- // goodsInfo = JDUtil.getGoodsDetail(commonGoods.getGoodsId()); //
- // 鐖彇缃戦〉
- // //jdGoods = JDApiUtil.getGoodsDetail(goodsId); // 鏅�氭帴鍙�
- // }
- //// JDGoods goodsInfo =
- // jdGoodsCacheUtil.getGoodsInfo(commonGoods.getGoodsId());
- // goodsDetail = GoodsDetailVOFactory.convertJDGoods(goodsInfo,
- // params);
- // } else if (commonGoods.getGoodsType() ==
- // Constant.SOURCE_TYPE_PDD) {
- // PDDGoodsDetail goodsInfo =
- // pinDuoDuoCacheUtil.getGoodsInfo(commonGoods.getGoodsId());
- // goodsDetail = GoodsDetailVOFactory.convertPDDGoods(goodsInfo,
- // params);
- // }
+ if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ try {
+ TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
+ String pictUrlWhite = goodsBrief.getPictUrlWhite();
+ if (!StringUtil.isNullOrEmpty(pictUrlWhite)) {
+ goodsBrief.setPictUrl(pictUrlWhite);
- // if (goodsDetail == null) {
- // JsonUtil.printMode(out, callback,
- // JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
- // return;
- // }
+ List<String> picList = new ArrayList<>();
+ picList.add(pictUrlWhite);
- List<String> imgList = new ArrayList<>();
- imgList.add(
- "https://img.alicdn.com/bao/uploaded/i1/2578900982/O1CN01SUiNLE1J7nWMlpy1A_!!0-item_pic.jpg_220x220");
- imgList.add(
- "https://img.alicdn.com/bao/uploaded/i1/2398662401/O1CN01I2UoTF1TbhXVwhJrz_!!0-item_pic.jpg_220x220");
- imgList.add(
- "https://img.alicdn.com/bao/uploaded/i4/2640238597/O1CN01A5xBr32DNTYWJSDZe_!!0-item_pic.jpg_220x220");
- imgList.add(
- "https://img.alicdn.com/bao/uploaded/i3/2640238597/O1CN01H5Q0Ni2DNTYxGAy3V_!!0-item_pic.jpg_220x220");
+ List<String> imgList = goodsBrief.getImgList();
+ if (imgList != null) {
+ picList.addAll(imgList);
+ }
+ goodsBrief.setImgList(picList);
+ }
+
+ goodsDetail = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params);
+ } catch (TaobaoGoodsDownException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
+ return;
+ }
+ } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ JDGoods goodsInfo = jdGoodsCacheUtil.getGoodsInfo(commonGoods.getGoodsId());
+ goodsDetail = GoodsDetailVOFactory.convertJDGoods(goodsInfo, params);
+ } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ PDDGoodsDetail goodsInfo = pinDuoDuoCacheUtil.getGoodsInfo(commonGoods.getGoodsId());
+ goodsDetail = GoodsDetailVOFactory.convertPDDGoods(goodsInfo, params);
+ }
+
+ if (goodsDetail == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
+ return;
+ }
JSONObject object = new JSONObject();
- object.put("goodsId", 551062664275L);
- object.put("goodsType", 1);
- object.put("picUrl", "https://img.alicdn.com/bao/uploaded/i3/2640238597/O1CN01H5Q0Ni2DNTYxGAy3V_!!0-item_pic.jpg_220x220");
- object.put("imgList", imgList);
+ object.put("goodsId", goodsDetail.getGoodsId());
+ object.put("goodsType", goodsDetail.getGoodsType());
+ object.put("picUrl", goodsDetail.getPicUrl());
+ object.put("imgList", goodsDetail.getImgList());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
+ } finally {
+ setCommonGoods(null);
}
+
+ }
+
+ private void getGoods(String text) {
+ Long uid = Constant.LINK_TOKEN_VERIFY_UID;
+ clipboardAnalysisManager.parse("android", "55", text, uid, new IClipboardAnalysisResult() {
+ @Override
+ public void onResult(GoodsDocParseResultVO result) {}
+
+ @Override
+ public void onResult(String result) {}
+
+ @Override
+ public void onResult(CommonGoods goods) {
+ setCommonGoods(goods);
+ }
+
+ @Override
+ public void onResult(TokenVO tokenVO) {
+ }
+ @Override
+ public void none() {
+ }
+
+ @Override
+ public void needLogin(String msg) {
+ }
+ });
}
/**
@@ -758,7 +865,7 @@
e.printStackTrace();
}
}
-
+
/**
* 鍒犻櫎淇℃伅
*
@@ -783,7 +890,6 @@
e.printStackTrace();
}
}
-
/**
* 鏌ヨ鍝佽
@@ -823,5 +929,14 @@
}
}
-}
+ public CommonGoods getCommonGoods() {
+ return commonGoods;
+ }
+ public void setCommonGoods(CommonGoods commonGoods) {
+ this.commonGoods = commonGoods;
+ }
+
+
+
+}
--
Gitblit v1.8.0